Skip to content

Commit 66dd8ac

Browse files
laanwjComputerCraftr
authored andcommitted
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
2 parents 5f77a5f + d8a98f9 commit 66dd8ac

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)