guix: use guix cmake for all builds

diff --git a/contrib/depends/packages/libzip.mk b/contrib/depends/packages/libzip.mk
index b363829025efd580e50d0880d93afeda7f87d30a..92f1d462c662291943369e7b1d8b9b5722de1050 100644 (file)
--- 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)_mingw32_dependencies=native_cmake
 $(package)_patches += no-clonefile.patch
 
 define $(package)_preprocess_cmds

diff --git a/contrib/depends/packages/native_cmake.mk b/contrib/depends/packages/native_cmake.mk
deleted file mode 100644 (file)
index f5c8cf7..0000000
--- a/contrib/depends/packages/native_cmake.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-package=native_cmake
-$(package)_version=3.23.2
-$(package)_version_dot=v3.23
-$(package)_download_path=https://cmake.org/files/$($(package)_version_dot)/
-$(package)_file_name=cmake-$($(package)_version).tar.gz
-$(package)_sha256_hash=f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa
-
-define $(package)_config_cmds
-  ./bootstrap --prefix=$(build_prefix) -- -DCMAKE_USE_OPENSSL=OFF
-endef
-
-define $(package)_build_cmd
-  +$(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
\ No newline at end of file

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index 31e83d44196b6759f3af1539f788c0443569692d..bdc08a6196193eb4be96308a341e5ecd6b34dc4d 100644 (file)
--- 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=0cf7498b34900a1d9f6c070a44495f7171eb4a4cb66a7ceea53e8721c8812701
 $(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 native_libxcb_util_cursor
-$(package)_mingw32_dependencies=native_cmake
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
 $(package)_patches  = dont_hardcode_pwd.patch
@@ -186,14 +185,16 @@ define $(package)_config_cmds
   export PKG_CONFIG_SYSROOT_DIR=/ && \
   export PKG_CONFIG_LIBDIR=$(build_prefix)/lib/pkgconfig && \
   export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
+  unset CMAKE_PREFIX_PATH && \
   cd qtbase && \
   ./configure -top-level $($(package)_config_opts)
 endef
 
+# https://bugreports.qt.io/browse/QTBUG-112018
 define $(package)_build_cmds
   export LD_LIBRARY_PATH=${build_prefix}/lib/ && \
-  cmake --build . --target syncqt_build && \
-  $(MAKE)
+  unset CMAKE_PREFIX_PATH && \
+  $(MAKE) || $(MAKE)
 endef
 
 define $(package)_stage_cmds

diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index 84ead77adf87eb7fcb348296ddbad35a6c3a5145..812ba5afeb9aa0027150a01e542aafb84f499554 100644 (file)
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -8,7 +8,7 @@ darwin_packages :=
 darwin_native_packages = darwin_sdk native_cctools native_libtapi native_clang
 
 mingw32_packages = icu4c
-mingw32_native_packages = native_cmake
+mingw32_native_packages =
 
 qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_cursor libxcb_util_wm freetype fontconfig qt
 qt_darwin_packages := qt

diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk
index 19c4ccd5852b425b74a1807b533d6813d041d1be..c0455e47be63ebd5b522485a592a62471606c374 100644 (file)
--- a/contrib/depends/packages/polyseed.mk
+++ b/contrib/depends/packages/polyseed.mk
@@ -3,7 +3,6 @@ $(package)_version=2.0.0
 $(package)_download_path=https://github.com/tevador/polyseed/archive/refs/tags/
 $(package)_file_name=v$($(package)_version).tar.gz
 $(package)_sha256_hash=f36282fcbcd68d32461b8230c89e1a40661bd46b91109681cec637433004135a
-$(package)_mingw32_dependencies=native_cmake
 $(package)_patches=force-static-mingw.patch
 
 define $(package)_preprocess_cmds

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index cc68efcfd281a858252b2a304e0a6d8b028ba9d2..a3320898dc750b9e6d029041dfd725cc305d749e 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -5,7 +5,7 @@ $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=0cf7498b34900a1d9f6c070a44495f7171eb4a4cb66a7ceea53e8721c8812701
 $(package)_darwin_dependencies=native_cctools native_qt openssl
-$(package)_mingw32_dependencies=openssl native_cmake native_qt native_libxkbcommon
+$(package)_mingw32_dependencies=openssl native_qt native_libxkbcommon
 $(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_linguist_tools = lrelease lupdate lconvert
@@ -301,7 +301,7 @@ define $(package)_config_cmds
    export V=1 && \
    export VERBOSE=1 && \
    cd qtbase && \
-  ./configure -top-level $($(package)_config_opts) -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib --debug-find-pkg=WMF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+  ./configure -top-level $($(package)_config_opts) -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 endef
 else
 define $(package)_config_cmds

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index b786f60e67c0a4067db09359dabb173bc0c59f26..282474621566054781756b92e4b42bea4bc82085 100644 (file)
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -353,6 +353,7 @@ parse, modify and abstract ELF, PE and MachO formats.")
         gperf
         gettext-minimal
         squashfs-tools
+        cmake
         ;; Native GCC 10 toolchain
         gcc-toolchain-10
         (list gcc-toolchain-10 "static")
@@ -370,7 +371,7 @@ parse, modify and abstract ELF, PE and MachO formats.")
            (list (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
                  (make-nsis-for-gcc-10 nsis-x86_64)))
           ((string-contains target "-linux-")
-           (list (make-bitcoin-cross-toolchain target) cmake))
+           (list (make-bitcoin-cross-toolchain target)))
           ((string-contains target "darwin")
-           (list clang-toolchain-10 binutils cmake ldid))
+           (list clang-toolchain-10 binutils ldid))
           (else '())))))