mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 19:42:46 +01:00
merge bitcoin#28422: cctools 986, ld64 711 & libtapi 1300.0.6.5
This commit is contained in:
parent
fe94154851
commit
b265352c7a
@ -1,11 +1,10 @@
|
|||||||
package=native_cctools
|
package=native_cctools
|
||||||
$(package)_version=2ef2e931cf641547eb8a68cfebde61003587c9fd
|
$(package)_version=c74fafe86076713cb8e6f937af43b6df6da1f42d
|
||||||
$(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive
|
$(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive
|
||||||
$(package)_file_name=$($(package)_version).tar.gz
|
$(package)_file_name=$($(package)_version).tar.gz
|
||||||
$(package)_sha256_hash=6b73269efdf5c58a070e7357b66ee760501388549d6a12b423723f45888b074b
|
$(package)_sha256_hash=e2c1588d505a69c32e079f4e616e0f117d5478429040e394f624f43f2796e6bc
|
||||||
$(package)_build_subdir=cctools
|
$(package)_build_subdir=cctools
|
||||||
$(package)_dependencies=native_libtapi
|
$(package)_dependencies=native_libtapi
|
||||||
$(package)_patches=no_fixup_chains.patch
|
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
$(package)_config_opts=--target=$(host) --enable-lto-support
|
$(package)_config_opts=--target=$(host) --enable-lto-support
|
||||||
@ -18,15 +17,9 @@ endef
|
|||||||
ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
|
ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
|
||||||
define $(package)_preprocess_cmds
|
define $(package)_preprocess_cmds
|
||||||
mkdir -p $($(package)_staging_prefix_dir)/lib && \
|
mkdir -p $($(package)_staging_prefix_dir)/lib && \
|
||||||
cp $(llvm_lib_dir)/libLTO.so $($(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
|
|
||||||
endef
|
endef
|
||||||
else
|
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
|
endif
|
||||||
|
|
||||||
define $(package)_config_cmds
|
define $(package)_config_cmds
|
||||||
|
@ -1,13 +1,18 @@
|
|||||||
package=native_libtapi
|
package=native_libtapi
|
||||||
$(package)_version=664b8414f89612f2dfd35a9b679c345aa5389026
|
$(package)_version=eb33a59f2e30ff9724dc1ea8bee8b5229b0557c9
|
||||||
$(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
|
$(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
|
||||||
$(package)_file_name=$($(package)_version).tar.gz
|
$(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)),)
|
ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
|
||||||
$(package)_dependencies=native_clang
|
$(package)_dependencies=native_clang
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
define $(package)_preprocess_cmds
|
||||||
|
patch -p1 < $($(package)_patch_dir)/disable_zlib.patch
|
||||||
|
endef
|
||||||
|
|
||||||
define $(package)_build_cmds
|
define $(package)_build_cmds
|
||||||
CC=$(clang_prog) CXX=$(clangxx_prog) INSTALLPREFIX=$($(package)_staging_prefix_dir) ./build.sh
|
CC=$(clang_prog) CXX=$(clangxx_prog) INSTALLPREFIX=$($(package)_staging_prefix_dir) ./build.sh
|
||||||
endef
|
endef
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
commit 5860b35ff6c7241d1c35a1b3197b45e5c9ff86cf
|
|
||||||
Author: fanquake <fanquake@gmail.com>
|
|
||||||
Date: Thu Jun 29 11:52:43 2023 +0100
|
|
||||||
|
|
||||||
ld64: add support for -no_fixup_chains
|
|
||||||
|
|
||||||
This is added in later versions, and is required if we want to be able
|
|
||||||
to disable fixup_chains, for use in security tests.
|
|
||||||
|
|
||||||
diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
|
|
||||||
index 15e8e88..b6580af 100644
|
|
||||||
--- a/cctools/ld64/src/ld/Options.cpp
|
|
||||||
+++ b/cctools/ld64/src/ld/Options.cpp
|
|
||||||
@@ -4128,6 +4128,9 @@ void Options::parse(int argc, const char* argv[])
|
|
||||||
else if ( strcmp(arg, "-fixup_chains") == 0 ) {
|
|
||||||
fMakeChainedFixups = true;
|
|
||||||
}
|
|
||||||
+ else if ( strcmp(arg, "-no_fixup_chains") == 0 ) {
|
|
||||||
+ fMakeChainedFixups = false;
|
|
||||||
+ }
|
|
||||||
else if (strcmp(arg, "-debug_variant") == 0) {
|
|
||||||
fDebugVariant = true;
|
|
||||||
}
|
|
17
depends/patches/native_libtapi/disable_zlib.patch
Normal file
17
depends/patches/native_libtapi/disable_zlib.patch
Normal file
@ -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 ""
|
Loading…
Reference in New Issue
Block a user