Skip to content

Commit 12ba656

Browse files
committed
Merge #16089: depends: add ability to skip building zeromq
c995c87 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 c995c87 jonasschnelli: utACK c995c87 Tree-SHA512: 72269707916d5af0bc8ecdd89f61e49264dba29350f9508fe0a497e8ce8dae66f6a828cf0bf4d97b6f95356b505cb3e6c365e8476219dd56c4535c850df393c9
2 parents de458da + c995c87 commit 12ba656

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

depends/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ SDK_PATH ?= $(BASEDIR)/SDKs
77
NO_QT ?=
88
RAPIDCHECK ?=
99
NO_WALLET ?=
10+
NO_ZMQ ?=
1011
NO_UPNP ?=
1112
FALLBACK_DOWNLOAD_PATH ?= https://bitcoincore.org/depends-sources
1213

@@ -93,6 +94,7 @@ $(host_arch)_$(host_os)_id_string+=$(shell $(host_STRIP) --version 2>/dev/null)
9394
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages)
9495
wallet_packages_$(NO_WALLET) = $(wallet_packages)
9596
upnp_packages_$(NO_UPNP) = $(upnp_packages)
97+
zmq_packages_$(NO_ZMQ) = $(zmq_packages)
9698

9799
rapidcheck_packages_$(RAPIDCHECK) = $(rapidcheck_packages)
98100

@@ -103,6 +105,10 @@ ifneq ($(qt_packages_),)
103105
native_packages += $(qt_native_packages)
104106
endif
105107

108+
ifneq ($(zmq_packages_),)
109+
packages += $(zmq_packages)
110+
endif
111+
106112
ifeq ($(rapidcheck_packages_),)
107113
packages += $(rapidcheck_packages)
108114
endif
@@ -143,6 +149,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
143149
-e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
144150
-e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
145151
-e 's|@no_qt@|$(NO_QT)|' \
152+
-e 's|@no_zmq@|$(NO_ZMQ)|' \
146153
-e 's|@no_wallet@|$(NO_WALLET)|' \
147154
-e 's|@no_upnp@|$(NO_UPNP)|' \
148155
-e 's|@debug@|$(DEBUG)|' \

depends/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ The following can be set when running make: make FOO=bar
6868
SDK_PATH: Path where sdk's can be found (used by macOS)
6969
FALLBACK_DOWNLOAD_PATH: If a source file can't be fetched, try here before giving up
7070
NO_QT: Don't download/build/cache qt and its dependencies
71+
NO_ZMQ: Don't download/build/cache packages needed for enabling zeromq
7172
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
7273
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
7374
DEBUG: disable some optimizations and enable more runtime checking

depends/config.site.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ if test -z $with_gui && test -n "@no_qt@"; then
3333
with_gui=no
3434
fi
3535

36+
if test -z $enable_zmq && test -n "@no_zmq@"; then
37+
enable_zmq=no
38+
fi
39+
3640
if test x@host_os@ = xdarwin; then
3741
BREW=no
3842
PORT=no

depends/packages/packages.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packages:=boost openssl libevent zeromq
1+
packages:=boost openssl libevent
22

33
qt_native_packages = native_protobuf
44
qt_packages = qrencode protobuf zlib
@@ -12,6 +12,8 @@ qt_mingw32_packages=qt
1212

1313
wallet_packages=bdb
1414

15+
zmq_packages=zeromq
16+
1517
upnp_packages=miniupnpc
1618

1719
darwin_native_packages = native_biplist native_ds_store native_mac_alias

0 commit comments

Comments
 (0)