diff options
| author | fanquake <fanquake@gmail.com> | 2023-09-06 15:06:39 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-09-06 16:36:33 +0100 |
| commit | 1ed1183f47794d1a2d8deced58226b2a4e84eaf0 (patch) | |
| tree | 1a175272d6512e91ae76739868556a0803e1b8f9 | |
| parent | 9d3b216e009a53ffcecd57e7f10df15cccd5fd6d (diff) | |
| download | bitcoin-1ed1183f47794d1a2d8deced58226b2a4e84eaf0.tar.xz | |
depends: libtapi 1300.0.6.5
| -rw-r--r-- | depends/packages/native_libtapi.mk | 9 | ||||
| -rw-r--r-- | depends/patches/native_libtapi/disable_zlib.patch | 17 |
2 files changed, 24 insertions, 2 deletions
diff --git a/depends/packages/native_libtapi.mk b/depends/packages/native_libtapi.mk index 052bb23689..a855c393c6 100644 --- 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_libtapi/disable_zlib.patch b/depends/patches/native_libtapi/disable_zlib.patch new file mode 100644 index 0000000000..6c7691214a --- /dev/null +++ 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 "" |