Skip to content

Commit 0cee156

Browse files
committed
build: allow NO_BOOST=1 in depends
1 parent 8915e4d commit 0cee156

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

depends/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ SOURCES_PATH ?= $(BASEDIR)/sources
3232
WORK_PATH = $(BASEDIR)/work
3333
BASE_CACHE ?= $(BASEDIR)/built
3434
SDK_PATH ?= $(BASEDIR)/SDKs
35+
NO_BOOST ?=
3536
NO_QT ?=
3637
NO_QR ?=
3738
NO_BDB ?=
@@ -147,6 +148,7 @@ include packages/packages.mk
147148
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))')
148149
$(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))')
149150

151+
boost_packages_$(NO_BOOST) = $(boost_packages)
150152
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
151153

152154
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
@@ -162,7 +164,7 @@ zmq_packages_$(NO_ZMQ) = $(zmq_packages)
162164
multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
163165
usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)
164166

165-
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(natpmp_packages_) $(usdt_packages_)
167+
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(natpmp_packages_) $(usdt_packages_)
166168
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
167169

168170
ifneq ($(zmq_packages_),)

depends/packages/packages.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
packages:=boost libevent
1+
packages:= libevent
2+
3+
boost_packages = boost
24

35
qrencode_linux_packages = qrencode
46
qrencode_android_packages = qrencode

0 commit comments

Comments
 (0)