File tree 4 files changed +27
-35
lines changed
4 files changed +27
-35
lines changed Original file line number Diff line number Diff line change 1
1
package =native_cctools
2
- $(package)_version =2ef2e931cf641547eb8a68cfebde61003587c9fd
2
+ $(package)_version =c74fafe86076713cb8e6f937af43b6df6da1f42d
3
3
$(package)_download_path =https://github.com/tpoechtrager/cctools-port/archive
4
4
$(package)_file_name =$($(package ) _version) .tar.gz
5
- $(package)_sha256_hash =6b73269efdf5c58a070e7357b66ee760501388549d6a12b423723f45888b074b
5
+ $(package)_sha256_hash =e2c1588d505a69c32e079f4e616e0f117d5478429040e394f624f43f2796e6bc
6
6
$(package)_build_subdir =cctools
7
7
$(package)_dependencies =native_libtapi
8
- $(package)_patches =no_fixup_chains.patch
9
8
10
9
define $(package)_set_vars
11
10
$(package ) _config_opts=--target=$(host ) --enable-lto-support
18
17
ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG ) ) ,)
19
18
define $(package)_preprocess_cmds
20
19
mkdir -p $($(package ) _staging_prefix_dir) /lib && \
21
- cp $(llvm_lib_dir ) /libLTO.so $($(package ) _staging_prefix_dir) /lib/ && \
22
- cp -f $(BASEDIR ) /config.guess $(BASEDIR ) /config.sub cctools && \
23
- patch -p1 < $($(package ) _patch_dir) /no_fixup_chains.patch
20
+ cp $(llvm_lib_dir ) /libLTO.so $($(package ) _staging_prefix_dir) /lib/
24
21
endef
25
22
else
26
- define $(package)_preprocess_cmds
27
- cp -f $(BASEDIR ) /config.guess $(BASEDIR ) /config.sub cctools && \
28
- patch -p1 < $($(package ) _patch_dir) /no_fixup_chains.patch
29
- endef
30
23
endif
31
24
32
25
define $(package)_config_cmds
Original file line number Diff line number Diff line change 1
1
package =native_libtapi
2
- $(package)_version =664b8414f89612f2dfd35a9b679c345aa5389026
2
+ $(package)_version =eb33a59f2e30ff9724dc1ea8bee8b5229b0557c9
3
3
$(package)_download_path =https://github.com/tpoechtrager/apple-libtapi/archive
4
4
$(package)_file_name =$($(package ) _version) .tar.gz
5
- $(package)_sha256_hash =62e419c12d1c9fad67cc1cd523132bc00db050998337c734c15bc8d73cc02b61
5
+ $(package)_sha256_hash =d4d46c64622f13d6938cecf989046d9561011bb59e8ee835f8f39825d67f578f
6
+ $(package)_patches =disable_zlib.patch
6
7
7
8
ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG ) ) ,)
8
9
$(package)_dependencies =native_clang
9
10
endif
10
11
12
+ define $(package)_preprocess_cmds
13
+ patch -p1 < $($(package ) _patch_dir) /disable_zlib.patch
14
+ endef
15
+
11
16
define $(package)_build_cmds
12
17
CC=$(clang_prog ) CXX=$(clangxx_prog ) INSTALLPREFIX=$($(package ) _staging_prefix_dir) ./build.sh
13
18
endef
Load Diff This file was deleted.
Original file line number Diff line number Diff line change
1
+ build: disable zlib
2
+
3
+ This isn't needed, and causes issues when clang-tblgen
4
+ is built, but trys to reach for a system libz.so.
5
+
6
+ diff --git a/build.sh b/build.sh
7
+ index e25d2f732..ec8422621 100755
8
+ --- a/build.sh
9
+ +++ b/build.sh
10
+ @@ -66,6 +66,7 @@ cmake ../src/llvm \
11
+ -DCMAKE_INSTALL_PREFIX=$INSTALLPREFIX \
12
+ -DTAPI_REPOSITORY_STRING=$TAPI_VERSION \
13
+ -DTAPI_FULL_VERSION=$TAPI_VERSION \
14
+ + -DLLVM_ENABLE_ZLIB=OFF \
15
+ $CMAKE_EXTRA_ARGS
16
+
17
+ echo ""
You can’t perform that action at this time.
0 commit comments