fix macos and darwin

6 files changed, 7 insertions, 10 deletions

diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml
index 41507d1..d461b80 100644
--- a/.github/workflows/full_check.yaml
+++ b/.github/workflows/full_check.yaml
@@ -210,7 +210,7 @@ jobs:
           xcode-version: '15.4'
       - name: install dependencies
         run: |
-          brew install ccache binutils
+          brew install ccache binutils pigz
       - name: Patch sources
         run: |
           git config --global --add safe.directory '*'
diff --git a/build_single.sh b/build_single.sh
index 98bac55..c686d64 100755
--- a/build_single.sh
+++ b/build_single.sh
@@ -79,7 +79,7 @@ pushd release/$repo
         # cp ../../$repo/build/${HOST_ABI}/external/polyseed/libpolyseed.${APPENDIX} ${HOST_ABI}_libpolyseed.${APPENDIX}
         # rm ${HOST_ABI}_libpolyseed.${APPENDIX}.xz || true
         # xz -e ${HOST_ABI}_libpolyseed.${APPENDIX}
-    elif [[ "${HOST_ABI}" == "x86_64-apple-darwin11" || "${HOST_ABI}" == "aarch64-apple-darwin11" || "${HOST_ABI}" == "host-apple-darwin" || "${HOST_ABI}" == "x86_64-host-apple-darwin" || "${HOST_ABI}" == "aarch64-host-apple-darwin" || "${HOST_ABI}" == "host-apple-ios" || "${HOST_ABI}" == "aarch64-apple-ios" ]];
+    elif [[ "${HOST_ABI}" == "x86_64-apple-darwin11" || "${HOST_ABI}" == "aarch64-apple-darwin11" || "${HOST_ABI}" == "host-apple-darwin" || "${HOST_ABI}" == "x86_64-host-apple-darwin" || "${HOST_ABI}" == "aarch64-apple-darwin"  || "${HOST_ABI}" == "x86_64-apple-darwin" || "${HOST_ABI}" == "host-apple-ios" || "${HOST_ABI}" == "aarch64-apple-ios" ]];
     then
         APPENDIX="${APPENDIX}dylib"
     else
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index 18addcb..70b592f 100644
--- a/contrib/depends/funcs.mk
+++ b/contrib/depends/funcs.mk
@@ -196,10 +196,6 @@ endef
 
 COMPRESS_CMD := $(shell if command -v pigz >/dev/null 2>&1; then echo "pigz"; else echo "gzip"; fi)
 
-ifeq ($(COMPRESS_CMD),gzip)
-	$(AT)echo Slow compression used, you may want to install pigz
-endif
-
 define int_add_cmds
 $($(1)_fetched):
 	$(AT)mkdir -p $$(@D) $(SOURCES_PATH)
diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk
index ea9ca6b..efbfdec 100644
--- a/contrib/depends/packages/boost.mk
+++ b/contrib/depends/packages/boost.mk
@@ -34,6 +34,7 @@ $(package)_config_libraries=system,filesystem,thread,timer,date_time,chrono,rege
 $(package)_cxxflags_linux=-fPIC
 $(package)_cxxflags_freebsd=-fPIC
 $(package)_cxxflags_android=-fPIC
+$(package)_cxxflags_darwin=-fPIC -std=c++11
 $(package)_ldflags_darwin=-L$(host_prefix)/lib -L$(shell xcrun --sdk macosx --show-sdk-path)/usr/lib
 $(package)_ldflags_ios=-L$(host_prefix)/lib -L$(IOS_SDK)/usr/lib
 endef
diff --git a/contrib/depends/packages/ncurses.mk b/contrib/depends/packages/ncurses.mk
index 62af976..770748b 100644
--- a/contrib/depends/packages/ncurses.mk
+++ b/contrib/depends/packages/ncurses.mk
@@ -21,7 +21,7 @@ define $(package)_set_vars
   $(package)_config_opts+=--without-tests
   $(package)_config_opts+=--without-tack
   $(package)_config_opts+=--without-manpages
-  $(package)_config_opts+=--with-termlib=tinfo
+  $(package)_config_opts+=--with-termlib
   $(package)_config_opts+=--disable-tic-depends
   $(package)_config_opts+=--disable-big-strings
   $(package)_config_opts+=--disable-ext-colors
@@ -54,10 +54,10 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  $(MAKE) -j$(NUM_CORES) $($(package)_build_opts) V=1
+  $(MAKE) $($(package)_build_opts) V=1
 endef
 
 define $(package)_stage_cmds
-  $(MAKE) -j$(NUM_CORES) install.libs DESTDIR=$($(package)_staging_dir)
+  $(MAKE) install.libs DESTDIR=$($(package)_staging_dir)
 endef
 
diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt
index 17ac05d..06e8fb8 100644
--- a/monero_libwallet2_api_c/CMakeLists.txt
+++ b/monero_libwallet2_api_c/CMakeLists.txt
@@ -76,7 +76,7 @@ if(${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch64
     set_target_properties(wallet2_api_c PROPERTIES NO_SONAME 1)
 endif()
 
-if(NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "aarch64-host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "host-apple-ios" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-ios")
+if(NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin11" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "x86_64-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "aarch64-host-apple-darwin" AND NOT ${HOST_ABI} STREQUAL "host-apple-ios" AND NOT ${HOST_ABI} STREQUAL "aarch64-apple-ios")
     set_target_properties(wallet2_api_c PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,ALL")
 endif()