diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk index 923a69c..a2f26da 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -22,6 +22,7 @@ $(package)_patches += no_wraprt_on_apple.patch $(package)_patches += qtbase-moc-ignore-gcc-macro.patch $(package)_patches += qtmultimedia-fixes.patch $(package)_patches += rcc_hardcode_timestamp.patch +$(package)_patches += riscvToolchain.cmake $(package)_patches += root_CMakeLists.txt $(package)_patches += v4l2.patch $(package)_patches += windows_func_fix.patch @@ -175,6 +176,9 @@ $(package)_config_opts_arm_linux += -- -DCMAKE_TOOLCHAIN_FILE=gnueabihfToolchain $(package)_config_opts_aarch64_linux += -qt-host-path $(build_prefix)/qt-host $(package)_config_opts_aarch64_linux += -- -DCMAKE_TOOLCHAIN_FILE=aarch64Toolchain.cmake -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib +$(package)_config_opts_riscv64_linux += -qt-host-path $(build_prefix)/qt-host +$(package)_config_opts_riscv64_linux += -- -DCMAKE_TOOLCHAIN_FILE=riscvToolchain.cmake -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib + $(package)_config_opts_mingw32 += -no-opengl $(package)_config_opts_mingw32 += -no-dbus $(package)_config_opts_mingw32 += -no-freetype @@ -260,6 +264,7 @@ define $(package)_preprocess_cmds mv $($(package)_patch_dir)/MacToolchain.cmake . && \ mv $($(package)_patch_dir)/aarch64Toolchain.cmake . && \ mv $($(package)_patch_dir)/gnueabihfToolchain.cmake . && \ + mv $($(package)_patch_dir)/riscvToolchain.cmake . && \ cd qtmultimedia && \ patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \ patch -p1 -i $($(package)_patch_dir)/v4l2.patch diff --git a/contrib/depends/patches/qt/riscvToolchain.cmake b/contrib/depends/patches/qt/riscvToolchain.cmake new file mode 100644 index 0000000..cf87142 --- /dev/null +++ b/contrib/depends/patches/qt/riscvToolchain.cmake @@ -0,0 +1,10 @@ +set(CMAKE_SYSTEM_NAME Linux) + +set(CMAKE_C_COMPILER riscv64-linux-gnu-gcc) +set(CMAKE_CXX_COMPILER riscv64-linux-gnu-g++) +set(CMAKE_FIND_ROOT_PATH /feather/contrib/depends/riscv64-linux-gnu/) + +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index bd077da..f01714a 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -75,6 +75,7 @@ mkdir -p "$VERSION_BASE" # Default to building for all supported HOSTs (overridable by environment) export HOSTS="${HOSTS:-x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf x86_64-linux-gnu.no-tor-bundle + riscv64-linux-gnu x86_64-w64-mingw32 x86_64-w64-mingw32.installer x86_64-apple-darwin}"