diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-01-05 15:23:34 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-01-05 15:23:48 +0100 |
| commit | 6e28714da357146379e23f0d5ccf9751fff77706 (patch) | |
| tree | 77a2c7538d6469fe58c7725306056fd3caf13e28 | |
| parent | e6ad8a6220bf076d2b1c2f785662b8aa9e52f83a (diff) | |
| parent | 3308718a6b41f09e9dd3c7caa9986cd6cb8f2eeb (diff) | |
| download | bitcoin-6e28714da357146379e23f0d5ccf9751fff77706.tar.xz | |
Merge #20850: [0.21] final rc5 backports
3308718a6b41f09e9dd3c7caa9986cd6cb8f2eeb Revert "Add patch to make codesign_allocate compatible with Apple's" (Pieter Wuille)
Pull request description:
ACKs for top commit:
jonasschnelli:
ACK 3308718a6b41f09e9dd3c7caa9986cd6cb8f2eeb
fanquake:
ACK 3308718a6b41f09e9dd3c7caa9986cd6cb8f2eeb
Tree-SHA512: 2a1002499e6f0da6e9ac7ae393e478bd34e55390ff1a41c5b16b4e91e339fef4b82642237af6725507337cadf9ddc1f2f23b2512d8dd47e5a345770c6c0d1b02
| -rw-r--r-- | depends/packages/native_cctools.mk | 5 | ||||
| -rw-r--r-- | depends/patches/native_cctools/segalign.patch | 19 |
2 files changed, 2 insertions, 22 deletions
diff --git a/depends/packages/native_cctools.mk b/depends/packages/native_cctools.mk index 33f69375cc..d56b636695 100644 --- a/depends/packages/native_cctools.mk +++ b/depends/packages/native_cctools.mk @@ -4,7 +4,7 @@ $(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive $(package)_file_name=$($(package)_version).tar.gz $(package)_sha256_hash=e51995a843533a3dac155dd0c71362dd471597a2d23f13dff194c6285362f875 $(package)_build_subdir=cctools -$(package)_patches=ld64_disable_threading.patch segalign.patch +$(package)_patches=ld64_disable_threading.patch ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) $(package)_clang_version=8.0.0 @@ -80,8 +80,7 @@ endef define $(package)_preprocess_cmds CC=$($(package)_cc) CXX=$($(package)_cxx) INSTALLPREFIX=$($(package)_extract_dir) ./libtapi/build.sh && \ CC=$($(package)_cc) CXX=$($(package)_cxx) INSTALLPREFIX=$($(package)_extract_dir) ./libtapi/install.sh && \ - patch -p1 < $($(package)_patch_dir)/ld64_disable_threading.patch && \ - patch -p1 < $($(package)_patch_dir)/segalign.patch + patch -p1 < $($(package)_patch_dir)/ld64_disable_threading.patch endef define $(package)_config_cmds diff --git a/depends/patches/native_cctools/segalign.patch b/depends/patches/native_cctools/segalign.patch deleted file mode 100644 index bcdbd67a6c..0000000000 --- a/depends/patches/native_cctools/segalign.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 7f2eb11ce6ebec7eb9b8e1429535e453054143e5 -Author: Pieter Wuille <pieter@wuille.net> -Date: Sun Dec 13 11:34:21 2020 -0800 - - Make cctools_port's codesign_allocate compatible with Apple's - -diff --git a/cctools/libstuff/arch.c b/cctools/libstuff/arch.c -index 6f2332f..d85c25c 100644 ---- a/cctools/libstuff/arch.c -+++ b/cctools/libstuff/arch.c -@@ -134,7 +134,7 @@ static const struct cpu_entry cpu_entries[] = { - { CPU_TYPE_ARM, LITTLE_ENDIAN_BYTE_SEX, 0, 0x4000 }, - - /* desktop */ -- { CPU_TYPE_X86_64, LITTLE_ENDIAN_BYTE_SEX, 0x7fff5fc00000LL, 0x1000 }, -+ { CPU_TYPE_X86_64, LITTLE_ENDIAN_BYTE_SEX, 0x7fff5fc00000LL, 0x2000 /* Used to be 0x1000; changed to 0x2000 to match Apple's distributed codesign_allocate. */}, - { CPU_TYPE_I386, LITTLE_ENDIAN_BYTE_SEX, 0xc0000000, 0x1000 }, - { CPU_TYPE_POWERPC, BIG_ENDIAN_BYTE_SEX, 0xc0000000, 0x1000 }, - { CPU_TYPE_POWERPC64, BIG_ENDIAN_BYTE_SEX, 0x7ffff00000000LL, 0x1000 }, |