From 3308718a6b41f09e9dd3c7caa9986cd6cb8f2eeb Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Mon, 4 Jan 2021 16:34:28 -0800 Subject: Revert "Add patch to make codesign_allocate compatible with Apple's" This reverts commit a4118c6e200e02e7560f8bc213697aa2909d95b1. Github-Pull: #20855 Rebased-From: a0eb4c551ebf8adfacb8c38c4ce56641fe379667 --- depends/packages/native_cctools.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'depends/packages/native_cctools.mk') 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 -- cgit v1.2.3