diff --git a/depends/Makefile b/depends/Makefile index 17eac508d..e9fbdb8dd 100644 --- a/depends/Makefile +++ b/depends/Makefile @@ -6,6 +6,7 @@ SDK_PATH ?= $(BASEDIR)/SDKs NO_QT ?= NO_WALLET ?= NO_UPNP ?= +AVX2 ?= FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources BUILD = $(shell ./config.guess) @@ -92,14 +93,19 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null) qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) +avx2_packages_$(AVX2) = $(avx2_$(host_arch)_$(host_os)_packages) -packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) +packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(avx2_packages_1) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) ifneq ($(qt_packages_),) native_packages += $(qt_native_packages) endif +ifneq ($(avx2_packages_1),) +native_packages += $(avx2_native_packages) +endif + all_packages = $(packages) $(native_packages) meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk index 5d35644d3..ceab33045 100644 --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -1,9 +1,6 @@ packages:=boost openssl libevent zeromq native_packages := native_ccache -x86_64_linux_native_packages:=native_nasm -x86_64_linux_packages:=intel-ipsec-mb - qt_native_packages = native_protobuf qt_packages = qrencode protobuf zlib @@ -17,6 +14,9 @@ wallet_packages=bdb upnp_packages=miniupnpc +avx2_native_packages:=native_nasm +avx2_x86_64_linux_packages:=intel-ipsec-mb + darwin_native_packages = native_biplist native_ds_store native_mac_alias ifneq ($(build_os),darwin)