From dff8072336687c9a2272dff409c91fd479ab1042 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sun, 8 Jan 2023 14:56:54 +0100 Subject: [PATCH] depends: linux: don't build cmake --- contrib/depends/packages/appimage_runtime.mk | 2 +- contrib/depends/packages/libappimage.mk | 2 +- contrib/depends/packages/libzip.mk | 1 - contrib/depends/packages/native_qt.mk | 1 - contrib/depends/packages/packages.mk | 2 +- contrib/depends/packages/polyseed.mk | 1 - contrib/depends/packages/qt.mk | 2 +- contrib/depends/toolchain.cmake.in | 6 +++++- contrib/guix/manifest.scm | 3 ++- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/contrib/depends/packages/appimage_runtime.mk b/contrib/depends/packages/appimage_runtime.mk index 3f49889..4f9b2c6 100644 --- a/contrib/depends/packages/appimage_runtime.mk +++ b/contrib/depends/packages/appimage_runtime.mk @@ -4,7 +4,7 @@ $(package)_version=13 $(package)_download_path=https://github.com/AppImage/AppImageKit/archive/refs/tags/ $(package)_file_name=$($(package)_version).tar.gz $(package)_sha256_hash=51b837c78dd99ecc1cf3dd283f4a98a1be665b01457da0edc1ff736d12974b1a -$(package)_dependencies=native_cmake libsquashfuse libappimage liblzma +$(package)_dependencies=libsquashfuse libappimage liblzma $(package)_patches=CMakeLists.txt runtime.c notify.c define $(package)_preprocess_cmds diff --git a/contrib/depends/packages/libappimage.mk b/contrib/depends/packages/libappimage.mk index 14beef6..12b0b62 100644 --- a/contrib/depends/packages/libappimage.mk +++ b/contrib/depends/packages/libappimage.mk @@ -3,7 +3,7 @@ $(package)_version=v0.1.x-legacy $(package)_download_path=https://github.com/AppImageCommunity/libappimage/archive/refs/heads/ $(package)_file_name=$($(package)_version).tar.gz $(package)_sha256_hash=fef3962bfb75f986f24c530a6230e95b8c79e46da3dd581543f1b615d45e7389 -$(package)_dependencies=native_cmake liblzma libfuse libarchive +$(package)_dependencies=liblzma libfuse libarchive $(package)_patches=no-unneeded-deps.patch define $(package)_preprocess_cmds diff --git a/contrib/depends/packages/libzip.mk b/contrib/depends/packages/libzip.mk index 7bdb26f..b363829 100644 --- a/contrib/depends/packages/libzip.mk +++ b/contrib/depends/packages/libzip.mk @@ -4,7 +4,6 @@ $(package)_download_path=https://libzip.org/download/ $(package)_file_name=libzip-1.9.2.tar.gz $(package)_sha256_hash=fd6a7f745de3d69cf5603edc9cb33d2890f0198e415255d0987a0cf10d824c6f $(package)_dependencies=zlib -$(package)_linux_dependencies=native_cmake $(package)_mingw32_dependencies=native_cmake $(package)_patches += no-clonefile.patch diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk index 20f2764..7de11e5 100644 --- a/contrib/depends/packages/native_qt.mk +++ b/contrib/depends/packages/native_qt.mk @@ -5,7 +5,6 @@ $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae $(package)_dependencies=native_libxcb native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm -$(package)_linux_dependencies=native_cmake $(package)_mingw32_dependencies=native_cmake $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_linguist_tools = lrelease lupdate lconvert diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index e3b87ec..f9ffce1 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -2,7 +2,7 @@ packages := boost openssl libiconv ldns unbound qrencode zbar sodium polyseed hi native_packages := native_expat native_libxcb native_xcb_proto native_libXau native_xproto native_freetype native_fontconfig native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm native_qt native_protobuf linux_packages := eudev liblzma libarchive libfuse libsquashfuse libappimage appimage_runtime -linux_native_packages = native_cmake native_patchelf +linux_native_packages = native_patchelf darwin_packages := darwin_native_packages = native_cctools native_libtapi native_clang native_ds_store native_mac_alias diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk index 7bcab89..b39d8e1 100644 --- a/contrib/depends/packages/polyseed.mk +++ b/contrib/depends/packages/polyseed.mk @@ -3,7 +3,6 @@ $(package)_version=1.0.0 $(package)_download_path=https://github.com/tevador/polyseed/archive/refs/tags/ $(package)_file_name=v$($(package)_version).tar.gz $(package)_sha256_hash=45f1e6c08575286581079e6e26d341a3a33abe1f1ee2d026bd098cf632ea2349 -$(package)_linux_dependencies=native_cmake $(package)_mingw32_dependencies=native_cmake $(package)_patches=no_shared.patch force-static-mingw.patch 32-bit.patch diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk index 9f7d214..2aae432 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -6,7 +6,7 @@ $(package)_file_name=qtbase-$($(package)_suffix) $(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae $(package)_darwin_dependencies=native_cctools native_qt openssl $(package)_mingw32_dependencies=openssl native_cmake native_qt native_freetype native_fontconfig native_libxkbcommon -$(package)_linux_dependencies=openssl native_qt native_cmake native_freetype native_fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm +$(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_linguist_tools = lrelease lupdate lconvert $(package)_patches = aarch64Toolchain.cmake diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 7c5eaff..89f5cf6 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -15,7 +15,11 @@ SET(BUILD_TESTS @build_tests@) SET(TREZOR_DEBUG @build_tests@) # where is the target environment -SET(CMAKE_FIND_ROOT_PATH @prefix@ /usr /gnu/store /feather/contrib/depends/SDKs/) +SET(CMAKE_FIND_ROOT_PATH @prefix@ /feather/contrib/depends/SDKs/ /home/user/.guix-profile/@HOST@) + +if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND ARCHITECTURE STREQUAL "x86_64") + SET(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} /home/user/.guix-profile/) +endif() SET(ENV{PKG_CONFIG_PATH} @prefix@/lib/pkgconfig) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 5fbe6ae..3a4ca42 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -696,7 +696,8 @@ inspecting signatures in Mach-O binaries.") (make-nsis-for-gcc-10 nsis-x86_64) osslsigncode)) ((string-contains target "-linux-") - (list (cond ((string-contains target "riscv64-") + (list cmake + (cond ((string-contains target "riscv64-") (make-bitcoin-cross-toolchain target #:base-libc (make-glibc-with-stack-protector (make-glibc-with-bind-now (make-glibc-without-werror glibc-2.27/bitcoin-patched)))))