ios fix, update depends, ci

5 files changed, 24 insertions, 26 deletions

diff --git a/contrib/depends/packages/libiconv.mk b/contrib/depends/packages/libiconv.mk
index 6ddfb7d..6bec738 100644
--- a/contrib/depends/packages/libiconv.mk
+++ b/contrib/depends/packages/libiconv.mk
@@ -10,7 +10,7 @@ define $(package)_set_vars
   $(package)_config_opts=--disable-shared
   $(package)_config_opts_linux=--with-pic
   $(package)_config_opts_freebsd=--with-pic
-  $(package)_ar_ios=$($(package)_ar) rcs
+  $(package)_ar_ios=$($(package)_ar)
 endef
 
 define $(package)_preprocess_cmds
diff --git a/contrib/depends/packages/native_ccache.mk b/contrib/depends/packages/native_ccache.mk
index 966804c..6821454 100644
--- a/contrib/depends/packages/native_ccache.mk
+++ b/contrib/depends/packages/native_ccache.mk
@@ -1,25 +1,25 @@
 package=native_ccache
-$(package)_version=3.3.4
+$(package)_version=4.10.2
 $(package)_download_path=https://samba.org/ftp/ccache
-$(package)_file_name=ccache-$($(package)_version).tar.bz2
-$(package)_sha256_hash=fa9d7f38367431bc86b19ad107d709ca7ecf1574fdacca01698bdf0a47cd8567
+$(package)_file_name=ccache-$($(package)_version).tar.gz
+$(package)_sha256_hash=108100960bb7e64573ea925af2ee7611701241abb36ce0aae3354528403a7d87
 
 define $(package)_set_vars
-$(package)_config_opts=
+$(package)_config_opts=-DCMAKE_INSTALL_PREFIX="$(host_prefix)/native"
 endef
 
 define $(package)_config_cmds
-  $($(package)_autoconf)
+  cmake -S . -B build $($(package)_config_opts)
 endef
 
 define $(package)_build_cmds
-  $(MAKE)
+  cmake --build build --parallel
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+  cd build && $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
 
 define $(package)_postprocess_cmds
-  rm -rf lib include
+  rm -rf $($(package)_staging_dir)/lib $($(package)_staging_dir)/include
 endef
diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk
index f710f61..4af0590 100644
--- a/contrib/depends/packages/sodium.mk
+++ b/contrib/depends/packages/sodium.mk
@@ -8,12 +8,12 @@ $(package)_patches=disable-glibc-getrandom-getentropy.patch fix-whitespace.patch
 define $(package)_set_vars
 $(package)_config_opts=--enable-static --disable-shared --with-pic
 $(package)_config_opts+=--prefix=$(host_prefix)
-$(package)_ar=$($(package)_ar) rcs
+$(package)_ar_ios=$($(package)_ar) rcs
 endef
 
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/disable-glibc-getrandom-getentropy.patch &&\
-  autoconf &&\
+  $($(package)_autoconf) &&\
   patch -p1 < $($(package)_patch_dir)/fix-whitespace.patch
 endef
 
diff --git a/contrib/depends/packages/wownero_seed.mk b/contrib/depends/packages/wownero_seed.mk
index 5335458..644dc60 100644
--- a/contrib/depends/packages/wownero_seed.mk
+++ b/contrib/depends/packages/wownero_seed.mk
@@ -11,15 +11,9 @@ define $(package)_preprocess_cmds
 endef
 
 
-ifeq ($(host_os),darwin)
-    define $(package)_config_cmds
-        CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
-    endef
-else
-    define $(package)_config_cmds
-        CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
-    endef
-endif
+define $(package)_config_cmds
+  CC="$($(package)_cc)" CXX="$($(package)_cxx)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DCMAKE_POSITION_INDEPENDENT_CODE=ON .
+endef
 
 define $(package)_set_vars
   $(package)_build_opts=CC="$($(package)_cc)" CXX="$($(package)_cxx)"
@@ -27,9 +21,9 @@ endef
 
 
 define $(package)_build_cmds
-    CC="$($(package)_cc)" CXX="$($(package)_cxx)" $(MAKE) VERBOSE=1
+    $(MAKE) VERBOSE=1
 endef
 
 define $(package)_stage_cmds
-    CC="$($(package)_cc)" CXX="$($(package)_cxx)" $(MAKE) DESTDIR=$($(package)_staging_dir) install
+    $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
diff --git a/contrib/depends/packages/zeromq.mk b/contrib/depends/packages/zeromq.mk
index 1b45bfb..1d63f65 100644
--- a/contrib/depends/packages/zeromq.mk
+++ b/contrib/depends/packages/zeromq.mk
@@ -9,8 +9,10 @@ define $(package)_set_vars
   $(package)_config_opts=--without-documentation --disable-shared --without-libsodium --disable-curve
   $(package)_config_opts_linux=--with-pic
   $(package)_config_opts_freebsd=--with-pic
+  $(package)_config_opts_ios=--host=$(host_arch)-apple-darwin
   $(package)_cxxflags=-std=c++11
-  $(package)_cxxflags_darwin=-std=c++11 -Wno-deprecated-declarations
+  $(package)_cxxflags_darwin=-std=c++11
+  $(package)_cxxflags_ios=-std=c++11
 endef
 
 define $(package)_preprocess_cmds
@@ -18,15 +20,17 @@ define $(package)_preprocess_cmds
 endef
 
 define $(package)_config_cmds
-  ./configure --host=aarch64-apple-darwin $($(package)_autoconf_args)
+  ./configure $($(package)_autoconf_args)
 endef
 
 define $(package)_build_cmds
-  $(MAKE) src/libzmq.la
+  $(MAKE) -j src/libzmq.la
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS install-pkgconfigDATA
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install-pkgconfigDATA VERBOSE=1 &&\
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES VERBOSE=1 &&\
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install-includeHEADERS VERBOSE=1
 endef
 
 define $(package)_postprocess_cmds