highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-04 04:02:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #20855: Revert "Add patch to make codesign_allocate compatible with Apple's"

Browse Source 
a0eb4c551ebf8adfacb8c38c4ce56641fe379667 Revert "Add patch to make codesign_allocate compatible with Apple's" (Pieter Wuille)

Pull request description:

  This reverts #20644.

  It appears that Apple has recently changed their `codesign_allocate` tool back to using 4k alignment on x86_64, at least in some cases, so this patch isn't causing our cctools-based version to be exactly compatible.

  Furthermore, if codesigning were to change to use https://github.com/achow101/signapple instead, there is no need anymore to try to mimick Apple.

ACKs for top commit:
  laanwj:
    ACK a0eb4c551ebf8adfacb8c38c4ce56641fe379667
  MarcoFalke:
    checked-clean-revert ACK a0eb4c551ebf8adfacb8c38c4ce56641fe379667
  jonasschnelli:
    ACK a0eb4c551ebf8adfacb8c38c4ce56641fe379667

Tree-SHA512: 529719a76811006122406689233d1e80995107fe1ac1fc862a4ac53ca21685748ed76cac7ca648dd70f0ea43dd8dcf2e29d559beeab10e1d30dc5542ac95fd97
This commit is contained in:
MarcoFalke 2021-01-05 09:39:27 +01:00
commit b40254b232
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
depends/packages/native_cctools.mk
View File

@ -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

19
depends/patches/native_cctools/segalign.patch
View File

@ -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 },