From a2c647d4bf76cb2dcd1d698cdc173bdba6afb67a Mon Sep 17 00:00:00 2001 From: Taylor Hornby Date: Tue, 15 Feb 2022 14:01:54 -0700 Subject: [PATCH] Untested, not working yet, use libtinfo from the debian packages --- depends/packages/native_clang.mk | 2 ++ depends/packages/native_libtinfo.mk | 51 +++++++++++++++++++++++++++++ depends/packages/packages.mk | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 depends/packages/native_libtinfo.mk diff --git a/depends/packages/native_clang.mk b/depends/packages/native_clang.mk index ac42cd3e1..06a011f3d 100644 --- a/depends/packages/native_clang.mk +++ b/depends/packages/native_clang.mk @@ -18,6 +18,8 @@ $(package)_download_file_aarch64_linux=clang+llvm-$($(package)_version)-aarch64- $(package)_file_name_aarch64_linux=clang-llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz $(package)_sha256_hash_aarch64_linux=968d65d2593850ee9b37fcda074fb7641529bd45d2f976af6c8197de3c22612f +$(package)_dependencies=native_libtinfo + # Ensure we have clang native to the builder, not the target host ifneq ($(canonical_host),$(build)) $(package)_exact_download_path=$($(package)_download_path_$(build_os)) diff --git a/depends/packages/native_libtinfo.mk b/depends/packages/native_libtinfo.mk new file mode 100644 index 000000000..9456028a4 --- /dev/null +++ b/depends/packages/native_libtinfo.mk @@ -0,0 +1,51 @@ +package=native_tinfo +#$(package)_major_version=13 +#$(package)_version=13.0.0 +#$(package)_download_path=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version) +$(package)_download_path_linux=http://ftp.debian.org/debian/pool/main/n/ncurses/ +$(package)_download_file_linux=libtinfo5_6.0+20161126-1+deb9u2_amd64.deb +$(package)_file_name_linux=libtinfo5_6.0+20161126-1+deb9u2_amd64.deb +$(package)_sha256_hash_linux=1d249a3193568b5ef785ad8993b9ba6d6fdca0eb359204c2355532b82d25e9f5 +#$(package)_download_path_darwin=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_major_version).0.0 +#$(package)_download_file_darwin=clang+llvm-$($(package)_major_version).0.0-x86_64-apple-darwin.tar.xz +#$(package)_file_name_darwin=clang-llvm-$($(package)_major_version).0.0-x86_64-apple-darwin.tar.xz +#$(package)_sha256_hash_darwin=d051234eca1db1f5e4bc08c64937c879c7098900f7a0370f3ceb7544816a8b09 +#$(package)_download_path_freebsd=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version) +#$(package)_download_file_freebsd=clang+llvm-$($(package)_version)-amd64-unknown-freebsd12.tar.xz +#$(package)_file_name_freebsd=clang-llvm-$($(package)_version)-amd64-unknown-freebsd12.tar.xz +#$(package)_sha256_hash_freebsd=e579747a36ff78aa0a5533fe43bc1ed1f8ed449c9bfec43c358d953ffbbdcf76 +#$(package)_download_file_aarch64_linux=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz +#$(package)_file_name_aarch64_linux=clang-llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz +#$(package)_sha256_hash_aarch64_linux=968d65d2593850ee9b37fcda074fb7641529bd45d2f976af6c8197de3c22612f + +## Ensure we have clang native to the builder, not the target host +#ifneq ($(canonical_host),$(build)) +#$(package)_exact_download_path=$($(package)_download_path_$(build_os)) +#$(package)_exact_download_file=$($(package)_download_file_$(build_os)) +#$(package)_exact_file_name=$($(package)_file_name_$(build_os)) +#$(package)_exact_sha256_hash=$($(package)_sha256_hash_$(build_os)) +#endif + +define $(package)_stage_cmds + pwd + ls -l + ls -l + ls -l +endef +#mkdir -p $($(package)_staging_prefix_dir)/bin && \ +#cp bin/clang-$($(package)_major_version) $($(package)_staging_prefix_dir)/bin && \ +#cp bin/lld $($(package)_staging_prefix_dir)/bin && \ +#cp bin/llvm-ar $($(package)_staging_prefix_dir)/bin && \ +#cp bin/llvm-config $($(package)_staging_prefix_dir)/bin && \ +#cp bin/llvm-nm $($(package)_staging_prefix_dir)/bin && \ +#cp bin/llvm-objcopy $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/clang $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/clang++ $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/ld.lld $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/ld64.lld $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/lld-link $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/llvm-ranlib $($(package)_staging_prefix_dir)/bin && \ +#cp -P bin/llvm-strip $($(package)_staging_prefix_dir)/bin && \ +#mv include/ $($(package)_staging_prefix_dir) && \ +#mv lib/ $($(package)_staging_prefix_dir) && \ +#mv libexec/ $($(package)_staging_prefix_dir) diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index b7407c861..de9248379 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,6 +1,6 @@ zcash_packages := libsodium utfcpp packages := boost libevent zeromq $(zcash_packages) googletest -native_packages := native_clang native_ccache native_rust +native_packages := native_clang native_libtinfo native_ccache native_rust wallet_packages=bdb