]> Nutra Git (v2) - gamesguru/feather.git/commitdiff
depends: darwin: don't build cmake
authortobtoht <tob@featherwallet.org>
Sat, 7 Jan 2023 16:23:01 +0000 (17:23 +0100)
committertobtoht <tob@featherwallet.org>
Mon, 9 Jan 2023 23:29:31 +0000 (00:29 +0100)
contrib/depends/packages/libzip.mk
contrib/depends/packages/native_qt.mk
contrib/depends/packages/packages.mk
contrib/depends/packages/polyseed.mk
contrib/depends/packages/qt.mk

index b06dc5d6b3ca5ee47a51b9bf0f23c451c895b06b..7bdb26f54b776dc6c439d6a26a4b5c424e181e44 100644 (file)
@@ -3,7 +3,9 @@ $(package)_version=1.9.2
 $(package)_download_path=https://libzip.org/download/
 $(package)_file_name=libzip-1.9.2.tar.gz
 $(package)_sha256_hash=fd6a7f745de3d69cf5603edc9cb33d2890f0198e415255d0987a0cf10d824c6f
-$(package)_dependencies=zlib native_cmake
+$(package)_dependencies=zlib
+$(package)_linux_dependencies=native_cmake
+$(package)_mingw32_dependencies=native_cmake
 $(package)_patches += no-clonefile.patch
 
 define $(package)_preprocess_cmds
index 143b94da0e9a8683c80404949d855e03ad3c7fb6..20f2764c71638dad1c904d44dfab411bb0dc693d 100644 (file)
@@ -4,7 +4,9 @@ $(package)_download_path=https://download.qt.io/official_releases/qt/6.4/$($(pac
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
 $(package)_sha256_hash=532ad71cc0f9c8f7cb92766c47bc3d23263c60876becd9053802f9727af24fae
-$(package)_dependencies=native_cmake native_libxcb native_libxkbcommon native_libxcb_util native_libxcb_util_render native_libxcb_util_keysyms native_libxcb_util_image native_libxcb_util_wm
+$(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
 $(package)_patches  = dont_hardcode_pwd.patch
index 6e487c0287a0b312e3284ad2299f8778c9cc4e80..e3b87ecf163f080f3ba94144992fcafd7d0f128d 100644 (file)
@@ -1,14 +1,14 @@
 packages := boost openssl libiconv ldns unbound qrencode zbar sodium polyseed hidapi protobuf libusb zlib libgpg-error libgcrypt expat libzip
-native_packages := native_cmake 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
+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_patchelf
+linux_native_packages = native_cmake native_patchelf
 
 darwin_packages :=
 darwin_native_packages = native_cctools native_libtapi native_clang native_ds_store native_mac_alias
 
 mingw32_packages = icu4c
-mingw32_native_packages =
+mingw32_native_packages = native_cmake
 
 qt_linux_packages := libxcb xcb_proto libXau xproto libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm freetype fontconfig qt
 qt_darwin_packages := qt
index 726aa7147c663470ed0fb70229ba36895d4fe14a..7bcab89c9e3302bdb63e9295e768fbbc22d1e1cf 100644 (file)
@@ -3,7 +3,8 @@ $(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)_dependencies=native_cmake
+$(package)_linux_dependencies=native_cmake
+$(package)_mingw32_dependencies=native_cmake
 $(package)_patches=no_shared.patch force-static-mingw.patch 32-bit.patch
 
 define $(package)_preprocess_cmds
index ffdd7b8e445d9aa633c70e73b52abd195747db5d..9f7d214b336e76c86de67647f88dbc97ade6fe91 100644 (file)
@@ -301,7 +301,7 @@ define $(package)_config_cmds
   export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
   export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
   cd qtbase && \
-  env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH ./configure -top-level $($(package)_config_opts) --debug-find-pkg=Threads -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+  env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH ./configure -top-level $($(package)_config_opts) -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
 endef
 else ifeq ($(host_os),mingw32)
 define $(package)_config_cmds