diff --git a/CMakeModules/Package.cmake b/CMakeModules/Package.cmake index 2bcf361..de51167 100644 --- a/CMakeModules/Package.cmake +++ b/CMakeModules/Package.cmake @@ -55,6 +55,7 @@ if (UNIX AND NOT APPLE) set(CPACK_DEBIAN_PACKAGE_SECTION "libs") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://axel.isouard.fr/libwebrtc") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE) + set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${_PACKAGE_ARCH}") set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB") endif (BUILD_DEB_PACKAGE) @@ -64,6 +65,7 @@ if (UNIX AND NOT APPLE) set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION}) set(CPACK_RPM_PACKAGE_URL "https://axel.isouard.fr/libwebrtc") set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0") + set(CPACK_RPM_PACKAGE_ARCHITECTURE "${_PACKAGE_ARCH}") set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM") endif (BUILD_RPM_PACKAGE) diff --git a/webrtc/CMakeLists.txt.in b/webrtc/CMakeLists.txt.in index 1203496..d02745b 100644 --- a/webrtc/CMakeLists.txt.in +++ b/webrtc/CMakeLists.txt.in @@ -72,7 +72,7 @@ set(_DEPENDENCIES webrtc-clang) if (UNIX AND NOT APPLE) libwebrtc_command( NAME webrtc-toolchain - COMMAND ${PYTHON_EXECUTABLE} ${WEBRTC_PARENT_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --running-as-hook + COMMAND ${PYTHON_EXECUTABLE} ${WEBRTC_PARENT_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=${TARGET_CPU} --running-as-hook WORKING_DIRECTORY "${WEBRTC_PARENT_DIR}" COMMENT "Retrieving sysroot" DEPENDS webrtc-sync