ios fix, update depends, ci

8 files changed, 53 insertions, 38 deletions

diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile
index 734d607..0cf6086 100644
--- a/contrib/depends/Makefile
+++ b/contrib/depends/Makefile
@@ -214,8 +214,8 @@ $(host_prefix)/share/toolchain.cmake: check-packages
 
 check-packages: check-sources
 
-install: check-packages $(host_prefix)/share/config.site
-install: check-packages $(host_prefix)/share/toolchain.cmake
+install: $(host_prefix)/share/config.site check-packages 
+install: $(host_prefix)/share/toolchain.cmake check-packages
 
 download-one: check-sources $(all_sources)
 
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index 0f3266c..7312e92 100644
--- a/contrib/depends/funcs.mk
+++ b/contrib/depends/funcs.mk
@@ -138,48 +138,58 @@ $(1)_build_env+=$($(1)_build_env_$(host_arch)) $($(1)_build_env_$(host_arch)_$(r
 $(1)_build_env+=$($(1)_build_env_$(host_os)) $($(1)_build_env_$(host_os)_$(release_type))
 $(1)_build_env+=$($(1)_build_env_$(host_arch)_$(host_os)) $($(1)_build_env_$(host_arch)_$(host_os)_$(release_type))
 
+ifneq ($$($(1)_ar_$(host_arch)),)
+$(1)_ar=$$($(1)_ar_$(host_arch))
+endif
+ifneq ($$($(1)_ar_$(host_os)),)
+$(1)_ar=$$($(1)_ar_$(host_os))
+endif
+ifneq ($$($(1)_ar_$(host_arch)_$(host_os)),)
+$(1)_ar=$$($(1)_ar_$(host_arch)_$(host_os))
+endif
+
 $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig
 $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig
 $(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)"
 $(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)"
 $(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)"
-$(1)_autoconf_nohost=--prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" AR="$$($(1)_ar)"
+$(1)_autoconf_args=--prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" AR="$$($(1)_ar)"
 $(1)_autoconf=./configure --host=$($($(1)_type)_host) --prefix=$($($(1)_type)_prefix) $$($(1)_config_opts) CC="$$($(1)_cc)" CXX="$$($(1)_cxx)" AR="$$($(1)_ar)"
 
 ifeq ($(filter $(1),libusb unbound),)
-$(1)_autoconf_nohost += --disable-dependency-tracking
+$(1)_autoconf_args += --disable-dependency-tracking
 $(1)_autoconf += --disable-dependency-tracking
 endif
 ifneq ($($(1)_nm),)
-$(1)_autoconf_nohost += NM="$$($(1)_nm)"
+$(1)_autoconf_args += NM="$$($(1)_nm)"
 $(1)_autoconf += NM="$$($(1)_nm)"
 endif
 ifneq ($($(1)_ranlib),)
-$(1)_autoconf_nohost += RANLIB="$$($(1)_ranlib)"
+$(1)_autoconf_args += RANLIB="$$($(1)_ranlib)"
 $(1)_autoconf += RANLIB="$$($(1)_ranlib)"
 endif
 ifneq ($($(1)_ar),)
-$(1)_autoconf_nohost += AR="$$($(1)_ar)"
+$(1)_autoconf_args += AR="$$($(1)_ar)"
 $(1)_autoconf += AR="$$($(1)_ar)"
 endif
 ifneq ($($(1)_arflags),)
-$(1)_autoconf_nohost += ARFLAGS="$$($(1)_arflags)"
+$(1)_autoconf_args += ARFLAGS="$$($(1)_arflags)"
 $(1)_autoconf += ARFLAGS="$$($(1)_arflags)"
 endif
 ifneq ($($(1)_cflags),)
-$(1)_autoconf_nohost += CFLAGS="$$($(1)_cflags)"
+$(1)_autoconf_args += CFLAGS="$$($(1)_cflags)"
 $(1)_autoconf += CFLAGS="$$($(1)_cflags)"
 endif
 ifneq ($($(1)_cxxflags),)
-$(1)_autoconf_nohost += CXXFLAGS="$$($(1)_cxxflags)"
+$(1)_autoconf_args += CXXFLAGS="$$($(1)_cxxflags)"
 $(1)_autoconf += CXXFLAGS="$$($(1)_cxxflags)"
 endif
 ifneq ($($(1)_cppflags),)
-$(1)_autoconf_nohost += CPPFLAGS="$$($(1)_cppflags)"
+$(1)_autoconf_args += CPPFLAGS="$$($(1)_cppflags)"
 $(1)_autoconf += CPPFLAGS="$$($(1)_cppflags)"
 endif
 ifneq ($($(1)_ldflags),)
-$(1)_autoconf_nohost += LDFLAGS="$$($(1)_ldflags)"
+$(1)_autoconf_args += LDFLAGS="$$($(1)_ldflags)"
 $(1)_autoconf += LDFLAGS="$$($(1)_ldflags)"
 endif
 endef
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
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index b6fc022..8a57e23 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -101,6 +101,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   SET(LLVM_ENABLE_PIC OFF)
   SET(LLVM_ENABLE_PIE OFF)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+  add_definitions(-DUSE_DEVICE_TREZOR=OFF)
+  add_definitions(-DHIDAPI_DUMMY=ON)
   SET(ANDROID TRUE)
   if(ARCHITECTURE STREQUAL "armv7a")
     SET(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
@@ -117,6 +119,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
   SET(_ANDROID_STANDALONE_TOOLCHAIN_API 21)
   SET(CMAKE_C_COMPILER @CC@)
   SET(CMAKE_CXX_COMPILER @CXX@)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+  set(USE_DEVICE_TREZOR OFF)
+  set(DHIDAPI_DUMMY ON)
+  SET(CMAKE_C_COMPILER @CC@)
+  SET(CMAKE_CXX_COMPILER @CXX@)
 else()
   SET(CMAKE_C_COMPILER @CC@)
   SET(CMAKE_CXX_COMPILER @CXX@)