Merge #16089: depends: add ability to skip building zeromq
c995c870aa
depends: add ability to skip building zeromq (fanquake) Pull request description: Similar to other depends packages, add the ability to skip building `zeromq` by passing `NO_ZMQ=1`. Fixes #15918. ACKs for commit c995c8: practicalswift: utACKc995c870aa
jonasschnelli: utACKc995c870aa
Tree-SHA512: 72269707916d5af0bc8ecdd89f61e49264dba29350f9508fe0a497e8ce8dae66f6a828cf0bf4d97b6f95356b505cb3e6c365e8476219dd56c4535c850df393c9
This commit is contained in:
commit
12ba656de3
4 changed files with 15 additions and 1 deletions
|
@ -7,6 +7,7 @@ SDK_PATH ?= $(BASEDIR)/SDKs
|
||||||
NO_QT ?=
|
NO_QT ?=
|
||||||
RAPIDCHECK ?=
|
RAPIDCHECK ?=
|
||||||
NO_WALLET ?=
|
NO_WALLET ?=
|
||||||
|
NO_ZMQ ?=
|
||||||
NO_UPNP ?=
|
NO_UPNP ?=
|
||||||
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
|
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
|
||||||
|
|
||||||
|
@ -93,6 +94,7 @@ $(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)
|
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages)
|
||||||
wallet_packages_$(NO_WALLET) = $(wallet_packages)
|
wallet_packages_$(NO_WALLET) = $(wallet_packages)
|
||||||
upnp_packages_$(NO_UPNP) = $(upnp_packages)
|
upnp_packages_$(NO_UPNP) = $(upnp_packages)
|
||||||
|
zmq_packages_$(NO_ZMQ) = $(zmq_packages)
|
||||||
|
|
||||||
rapidcheck_packages_$(RAPIDCHECK) = $(rapidcheck_packages)
|
rapidcheck_packages_$(RAPIDCHECK) = $(rapidcheck_packages)
|
||||||
|
|
||||||
|
@ -103,6 +105,10 @@ ifneq ($(qt_packages_),)
|
||||||
native_packages += $(qt_native_packages)
|
native_packages += $(qt_native_packages)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(zmq_packages_),)
|
||||||
|
packages += $(zmq_packages)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(rapidcheck_packages_),)
|
ifeq ($(rapidcheck_packages_),)
|
||||||
packages += $(rapidcheck_packages)
|
packages += $(rapidcheck_packages)
|
||||||
endif
|
endif
|
||||||
|
@ -143,6 +149,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
|
||||||
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
|
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
|
||||||
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
|
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
|
||||||
-e 's|@no_qt@|$(NO_QT)|' \
|
-e 's|@no_qt@|$(NO_QT)|' \
|
||||||
|
-e 's|@no_zmq@|$(NO_ZMQ)|' \
|
||||||
-e 's|@no_wallet@|$(NO_WALLET)|' \
|
-e 's|@no_wallet@|$(NO_WALLET)|' \
|
||||||
-e 's|@no_upnp@|$(NO_UPNP)|' \
|
-e 's|@no_upnp@|$(NO_UPNP)|' \
|
||||||
-e 's|@debug@|$(DEBUG)|' \
|
-e 's|@debug@|$(DEBUG)|' \
|
||||||
|
|
|
@ -68,6 +68,7 @@ The following can be set when running make: make FOO=bar
|
||||||
SDK_PATH: Path where sdk's can be found (used by macOS)
|
SDK_PATH: Path where sdk's can be found (used by macOS)
|
||||||
FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
|
FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
|
||||||
NO_QT: Don't download/build/cache qt and its dependencies
|
NO_QT: Don't download/build/cache qt and its dependencies
|
||||||
|
NO_ZMQ: Don't download/build/cache packages needed for enabling zeromq
|
||||||
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
|
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
|
||||||
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
|
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
|
||||||
DEBUG: disable some optimizations and enable more runtime checking
|
DEBUG: disable some optimizations and enable more runtime checking
|
||||||
|
|
|
@ -33,6 +33,10 @@ if test -z $with_gui && test -n "@no_qt@"; then
|
||||||
with_gui=no
|
with_gui=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test -z $enable_zmq && test -n "@no_zmq@"; then
|
||||||
|
enable_zmq=no
|
||||||
|
fi
|
||||||
|
|
||||||
if test x@host_os@ = xdarwin; then
|
if test x@host_os@ = xdarwin; then
|
||||||
BREW=no
|
BREW=no
|
||||||
PORT=no
|
PORT=no
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
packages:=boost openssl libevent zeromq
|
packages:=boost openssl libevent
|
||||||
|
|
||||||
qt_native_packages = native_protobuf
|
qt_native_packages = native_protobuf
|
||||||
qt_packages = qrencode protobuf zlib
|
qt_packages = qrencode protobuf zlib
|
||||||
|
@ -12,6 +12,8 @@ qt_mingw32_packages=qt
|
||||||
|
|
||||||
wallet_packages=bdb
|
wallet_packages=bdb
|
||||||
|
|
||||||
|
zmq_packages=zeromq
|
||||||
|
|
||||||
upnp_packages=miniupnpc
|
upnp_packages=miniupnpc
|
||||||
|
|
||||||
darwin_native_packages = native_biplist native_ds_store native_mac_alias
|
darwin_native_packages = native_biplist native_ds_store native_mac_alias
|
||||||
|
|
Loading…
Add table
Reference in a new issue