Skip to content

Commit b40254b

Browse files
author
MarcoFalke
committed
Merge #20855: Revert "Add patch to make codesign_allocate compatible with Apple's"
a0eb4c5 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 a0eb4c5 MarcoFalke: checked-clean-revert ACK a0eb4c5 jonasschnelli: ACK a0eb4c5 Tree-SHA512: 529719a76811006122406689233d1e80995107fe1ac1fc862a4ac53ca21685748ed76cac7ca648dd70f0ea43dd8dcf2e29d559beeab10e1d30dc5542ac95fd97
2 parents ff6adac + a0eb4c5 commit b40254b

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

depends/packages/native_cctools.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive
44
$(package)_file_name=$($(package)_version).tar.gz
55
$(package)_sha256_hash=e51995a843533a3dac155dd0c71362dd471597a2d23f13dff194c6285362f875
66
$(package)_build_subdir=cctools
7-
$(package)_patches=ld64_disable_threading.patch segalign.patch
7+
$(package)_patches=ld64_disable_threading.patch
88

99
ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
1010
$(package)_clang_version=8.0.0
@@ -80,8 +80,7 @@ endef
8080
define $(package)_preprocess_cmds
8181
CC=$($(package)_cc) CXX=$($(package)_cxx) INSTALLPREFIX=$($(package)_extract_dir) ./libtapi/build.sh && \
8282
CC=$($(package)_cc) CXX=$($(package)_cxx) INSTALLPREFIX=$($(package)_extract_dir) ./libtapi/install.sh && \
83-
patch -p1 < $($(package)_patch_dir)/ld64_disable_threading.patch && \
84-
patch -p1 < $($(package)_patch_dir)/segalign.patch
83+
patch -p1 < $($(package)_patch_dir)/ld64_disable_threading.patch
8584
endef
8685

8786
define $(package)_config_cmds

depends/patches/native_cctools/segalign.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)