Skip to content

Commit 10a5f19

Browse files
committed
Merge bitcoin/bitcoin#26833: build: allow NO_BOOST=1 & NO_LIBEVENT=1 in depends
7fdeb80 build: allow NO_LIBEVENT=1 in depends (fanquake) 0cee156 build: allow NO_BOOST=1 in depends (fanquake) Pull request description: Prerequisite for removing `install_db4.sh`. So we can invoke `make -C depends/ NO_BOOST=1 NO_LIBEVENT=1 NO_QT=1 NO_SQLITE=1 NO_NATPMP=1 NO_ZMQ=1 NO_UPNP=1 NO_USDT=1` and get a prefix with only bdb headers/libs. ACKs for top commit: hebasto: ACK 7fdeb80, tested on Ubuntu 22.04: Tree-SHA512: 9dd595a61b3178f0296b98d780be2ac37a0d498a75ed222fb1408b84c3e6d179ea18fd96025ea6ce250216be6843dfa46621021e8bc4601a4d1bb8b20387b9e4
2 parents 7799f53 + 7fdeb80 commit 10a5f19

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

depends/Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ SOURCES_PATH ?= $(BASEDIR)/sources
3232
WORK_PATH = $(BASEDIR)/work
3333
BASE_CACHE ?= $(BASEDIR)/built
3434
SDK_PATH ?= $(BASEDIR)/SDKs
35+
NO_BOOST ?=
36+
NO_LIBEVENT ?=
3537
NO_QT ?=
3638
NO_QR ?=
3739
NO_BDB ?=
@@ -147,6 +149,10 @@ include packages/packages.mk
147149
build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(build_AR)' RANLIB='$(build_RANLIB)' STRIP='$(build_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(BUILD_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
148150
$(host_arch)_$(host_os)_id:=$(shell env CC='$(host_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(host_CXX)' CXX_STANDARD='$(CXX_STANDARD)' AR='$(host_AR)' RANLIB='$(host_RANLIB)' STRIP='$(host_STRIP)' SHA256SUM='$(build_SHA256SUM)' DEBUG='$(DEBUG)' LTO='$(LTO)' ./gen_id '$(HOST_ID_SALT)' 'GUIX_ENVIRONMENT=$(realpath $(GUIX_ENVIRONMENT))')
149151

152+
boost_packages_$(NO_BOOST) = $(boost_packages)
153+
154+
libevent_packages_$(NO_LIBEVENT) = $(libevent_packages)
155+
150156
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
151157

152158
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
@@ -162,7 +168,7 @@ zmq_packages_$(NO_ZMQ) = $(zmq_packages)
162168
multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
163169
usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)
164170

165-
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(natpmp_packages_) $(usdt_packages_)
171+
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(natpmp_packages_) $(usdt_packages_)
166172
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
167173

168174
ifneq ($(zmq_packages_),)

depends/packages/packages.mk

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
packages:=boost libevent
1+
packages:=
2+
3+
boost_packages = boost
4+
5+
libevent_packages = libevent
26

37
qrencode_linux_packages = qrencode
48
qrencode_android_packages = qrencode

0 commit comments

Comments
 (0)