mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge #16089: depends: add ability to skip building zeromq
c995c870aa4cc9b9ddf0a84ce15c544757a43a18 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: utACK c995c870aa4cc9b9ddf0a84ce15c544757a43a18 jonasschnelli: utACK c995c870aa4cc9b9ddf0a84ce15c544757a43a18 Tree-SHA512: 72269707916d5af0bc8ecdd89f61e49264dba29350f9508fe0a497e8ce8dae66f6a828cf0bf4d97b6f95356b505cb3e6c365e8476219dd56c4535c850df393c9
This commit is contained in:
parent
a9d4ca1f2a
commit
bd4f568117
@ -34,6 +34,7 @@ BASE_CACHE ?= $(BASEDIR)/built
|
|||||||
SDK_PATH ?= $(BASEDIR)/SDKs
|
SDK_PATH ?= $(BASEDIR)/SDKs
|
||||||
NO_QT ?=
|
NO_QT ?=
|
||||||
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
|
||||||
|
|
||||||
@ -126,6 +127,7 @@ endif
|
|||||||
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)
|
||||||
|
|
||||||
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_)
|
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_)
|
||||||
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
|
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
|
||||||
@ -134,6 +136,10 @@ ifneq ($(qt_packages_),)
|
|||||||
native_packages += $(qt_native_packages)
|
native_packages += $(qt_native_packages)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(zmq_packages_),)
|
||||||
|
packages += $(zmq_packages)
|
||||||
|
endif
|
||||||
|
|
||||||
all_packages = $(packages) $(native_packages)
|
all_packages = $(packages) $(native_packages)
|
||||||
|
|
||||||
meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk
|
meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk
|
||||||
@ -193,6 +199,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
|
|||||||
-e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \
|
-e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \
|
||||||
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
|
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
|
||||||
-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)|' \
|
||||||
|
@ -79,6 +79,8 @@ The following can be set when running make: `make FOO=bar`
|
|||||||
<dd>If a source file can't be fetched, try here before giving up</dd>
|
<dd>If a source file can't be fetched, try here before giving up</dd>
|
||||||
<dt>NO_QT</dt>
|
<dt>NO_QT</dt>
|
||||||
<dd>Don't download/build/cache qt and its dependencies</dd>
|
<dd>Don't download/build/cache qt and its dependencies</dd>
|
||||||
|
<dt>NO_ZMQ</dt>
|
||||||
|
<dd>Don't download/build/cache packages needed for enabling zeromq</dd>
|
||||||
<dt>NO_WALLET</dt>
|
<dt>NO_WALLET</dt>
|
||||||
<dd>Don't download/build/cache libs needed to enable the wallet</dd>
|
<dd>Don't download/build/cache libs needed to enable the wallet</dd>
|
||||||
<dt>NO_UPNP</dt>
|
<dt>NO_UPNP</dt>
|
||||||
|
@ -43,6 +43,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 -n "@debug@" && test -z "@no_qt@" && test "x$with_gui" != xno; then
|
if test -n "@debug@" && test -z "@no_qt@" && test "x$with_gui" != xno; then
|
||||||
with_gui=qt5_debug
|
with_gui=qt5_debug
|
||||||
fi
|
fi
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
packages:=boost openssl libevent zeromq gmp bls-dash backtrace cmake immer
|
packages:=boost openssl libevent gmp bls-dash backtrace cmake immer
|
||||||
|
|
||||||
qt_native_packages = native_protobuf
|
qt_native_packages = native_protobuf
|
||||||
qt_packages = qrencode protobuf zlib
|
qt_packages = qrencode protobuf zlib
|
||||||
@ -10,6 +10,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…
Reference in New Issue
Block a user