Skip to content

Commit 4caad26

Browse files
theunitheuni
committed
depends: bump cctools to a custom version with less deps
This one no longer requires native libuuid or libcrypto
1 parent 46f54bf commit 4caad26

File tree

4 files changed

+6
-49
lines changed

4 files changed

+6
-49
lines changed

‎depends/packages/native_cctools.mk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package=native_cctools
2-
$(package)_version=59d21d2c793c51d205c8b4ab14b9b28e63c72445
2+
$(package)_version=ee31ae567931c426136c94aad457c7b51d844beb
33
$(package)_download_path=https://github.com/theuni/cctools-port/archive
44
$(package)_file_name=$($(package)_version).tar.gz
5-
$(package)_sha256_hash=e13c7129b9d496adf4d674156b4a1d72d8b936f29f377aae8f8b5e7b650cc305
5+
$(package)_sha256_hash=ef107e6ab1b3994cb22e14f4f5c59ea0c0b5a988e6b21d42ed9616b018bbcbf9
66
$(package)_build_subdir=cctools
7-
$(package)_dependencies=native_libuuid native_openssl
87
$(package)_clang_version=3.3
98
$(package)_clang_download_path=http://llvm.org/releases/$($(package)_clang_version)
109
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-amd64-Ubuntu-12.04.2.tar.gz
@@ -25,21 +24,21 @@ define $(package)_extract_cmds
2524
endef
2625

2726
define $(package)_set_vars
28-
$(package)_config_opts=--target=$(host) CC=toolchain/clang CXX=toolchain/clang++
27+
$(package)_config_opts=--target=$(host) --disable-libuuid
2928
$(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
29+
$(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
30+
$(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
3031
endef
3132

3233
define $(package)_preprocess_cmds
3334
cd $($(package)_build_subdir); ./autogen.sh
3435
endef
3536

3637
define $(package)_config_cmds
37-
export "PATH=$($(package)_extract_dir)/toolchain/bin:$(PATH)" && \
3838
$($(package)_autoconf)
3939
endef
4040

4141
define $(package)_build_cmds
42-
export "PATH=$($(package)_extract_dir)/toolchain/bin:$(PATH)" && \
4342
$(MAKE)
4443
endef
4544

‎depends/packages/native_libuuid.mk

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

‎depends/packages/native_openssl.mk

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

‎depends/packages/packages.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ wallet_packages=bdb
1919
upnp_packages=miniupnpc
2020

2121
ifneq ($(build_os),darwin)
22-
darwin_native_packages=native_libuuid native_openssl native_cctools native_cdrkit native_libdmg-hfsplus
22+
darwin_native_packages=native_cctools native_cdrkit native_libdmg-hfsplus
2323
endif

0 commit comments

Comments
 (0)