Skip to content

Commit 7fdeb80

Browse files
committed
build: allow NO_LIBEVENT=1 in depends
1 parent 0cee156 commit 7fdeb80

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

depends/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ WORK_PATH = $(BASEDIR)/work
3333
BASE_CACHE ?= $(BASEDIR)/built
3434
SDK_PATH ?= $(BASEDIR)/SDKs
3535
NO_BOOST ?=
36+
NO_LIBEVENT ?=
3637
NO_QT ?=
3738
NO_QR ?=
3839
NO_BDB ?=
@@ -149,6 +150,9 @@ build_id:=$(shell env CC='$(build_CC)' C_STANDARD='$(C_STANDARD)' CXX='$(build_C
149150
$(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))')
150151

151152
boost_packages_$(NO_BOOST) = $(boost_packages)
153+
154+
libevent_packages_$(NO_LIBEVENT) = $(libevent_packages)
155+
152156
qrencode_packages_$(NO_QR) = $(qrencode_$(host_os)_packages)
153157

154158
qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_)
@@ -164,7 +168,7 @@ zmq_packages_$(NO_ZMQ) = $(zmq_packages)
164168
multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
165169
usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)
166170

167-
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_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_)
168172
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
169173

170174
ifneq ($(zmq_packages_),)

depends/packages/packages.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
packages:= libevent
1+
packages:=
22

33
boost_packages = boost
44

5+
libevent_packages = libevent
6+
57
qrencode_linux_packages = qrencode
68
qrencode_android_packages = qrencode
79
qrencode_darwin_packages = qrencode

0 commit comments

Comments
 (0)