merge bitcoin#28422: cctools 986, ld64 711 & libtapi 1300.0.6.5

dashpay · Nov 13, 2024 · b265352 · b265352
1 parent fe94154
commit b265352
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 35 deletions.
diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk
@@ -1,11 +1,10 @@
 package=native_cctools
-$(package)_version=2ef2e931cf641547eb8a68cfebde61003587c9fd
+$(package)_version=c74fafe86076713cb8e6f937af43b6df6da1f42d
 $(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive
 $(package)_file_name=$($(package)_version).tar.gz
-$(package)_sha256_hash=6b73269efdf5c58a070e7357b66ee760501388549d6a12b423723f45888b074b
+$(package)_sha256_hash=e2c1588d505a69c32e079f4e616e0f117d5478429040e394f624f43f2796e6bc
 $(package)_build_subdir=cctools
 $(package)_dependencies=native_libtapi
-$(package)_patches=no_fixup_chains.patch
 
 define $(package)_set_vars
   $(package)_config_opts=--target=$(host) --enable-lto-support
@@ -18,15 +17,9 @@ endef
 ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
 define $(package)_preprocess_cmds
   mkdir -p $($(package)_staging_prefix_dir)/lib && \
-  cp $(llvm_lib_dir)/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools && \
-  patch -p1 < $($(package)_patch_dir)/no_fixup_chains.patch
+  cp $(llvm_lib_dir)/libLTO.so $($(package)_staging_prefix_dir)/lib/
 endef
 else
-define $(package)_preprocess_cmds
-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools && \
-  patch -p1 < $($(package)_patch_dir)/no_fixup_chains.patch
-endef
 endif
 
 define $(package)_config_cmds

diff --git a/depends/packages/native_libtapi.mk b/depends/packages/native_libtapi.mk
@@ -1,13 +1,18 @@
 package=native_libtapi
-$(package)_version=664b8414f89612f2dfd35a9b679c345aa5389026
+$(package)_version=eb33a59f2e30ff9724dc1ea8bee8b5229b0557c9
 $(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
 $(package)_file_name=$($(package)_version).tar.gz
-$(package)_sha256_hash=62e419c12d1c9fad67cc1cd523132bc00db050998337c734c15bc8d73cc02b61
+$(package)_sha256_hash=d4d46c64622f13d6938cecf989046d9561011bb59e8ee835f8f39825d67f578f
+$(package)_patches=disable_zlib.patch
 
 ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
 $(package)_dependencies=native_clang
 endif
 
+define $(package)_preprocess_cmds
+  patch -p1 < $($(package)_patch_dir)/disable_zlib.patch
+endef
+
 define $(package)_build_cmds
   CC=$(clang_prog) CXX=$(clangxx_prog) INSTALLPREFIX=$($(package)_staging_prefix_dir) ./build.sh
 endef

diff --git a/depends/patches/native_cctools/no_fixup_chains.patch b/depends/patches/native_cctools/no_fixup_chains.patch
diff --git a/depends/patches/native_libtapi/disable_zlib.patch b/depends/patches/native_libtapi/disable_zlib.patch
@@ -0,0 +1,17 @@
+build: disable zlib
+
+This isn't needed, and causes issues when clang-tblgen
+is built, but trys to reach for a system libz.so.
+
+diff --git a/build.sh b/build.sh
+index e25d2f732..ec8422621 100755
+--- a/build.sh
++++ b/build.sh
+@@ -66,6 +66,7 @@ cmake ../src/llvm \
+  -DCMAKE_INSTALL_PREFIX=$INSTALLPREFIX \
+  -DTAPI_REPOSITORY_STRING=$TAPI_VERSION \
+  -DTAPI_FULL_VERSION=$TAPI_VERSION \
++ -DLLVM_ENABLE_ZLIB=OFF \
+  $CMAKE_EXTRA_ARGS
+
+ echo ""