merge bitcoin#21629: fix configuring when building depends with NO_BDB=1

This commit is contained in:
Kittywhiskers Van Gogh 2021-04-07 15:22:49 +08:00 committed by pasta
parent 18098c3045
commit d3edc5b42c
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
3 changed files with 16 additions and 2 deletions

View File

@ -1321,9 +1321,11 @@ fi
if test x$enable_wallet != xno; then if test x$enable_wallet != xno; then
dnl Check for libdb_cxx only if wallet enabled dnl Check for libdb_cxx only if wallet enabled
BITCOIN_FIND_BDB48 if test "x$use_bdb" != "xno"; then
if test x$suppress_external_warnings != xno ; then BITCOIN_FIND_BDB48
if test x$suppress_external_warnings != xno ; then
BDB_CPPFLAGS=SUPPRESS_WARNINGS($BDB_CPPFLAGS) BDB_CPPFLAGS=SUPPRESS_WARNINGS($BDB_CPPFLAGS)
fi
fi fi
dnl Check for sqlite3 dnl Check for sqlite3

View File

@ -34,6 +34,8 @@ BASE_CACHE ?= $(BASEDIR)/built
SDK_PATH ?= $(BASEDIR)/SDKs SDK_PATH ?= $(BASEDIR)/SDKs
NO_QT ?= NO_QT ?=
NO_QR ?= NO_QR ?=
NO_BDB ?=
NO_SQLITE ?=
NO_WALLET ?= NO_WALLET ?=
NO_ZMQ ?= NO_ZMQ ?=
NO_UPNP ?= NO_UPNP ?=
@ -221,6 +223,8 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
-e 's|@no_qr@|$(NO_QR)|' \ -e 's|@no_qr@|$(NO_QR)|' \
-e 's|@no_zmq@|$(NO_ZMQ)|' \ -e 's|@no_zmq@|$(NO_ZMQ)|' \
-e 's|@no_wallet@|$(NO_WALLET)|' \ -e 's|@no_wallet@|$(NO_WALLET)|' \
-e 's|@no_bdb@|$(NO_BDB)|' \
-e 's|@no_sqlite@|$(NO_SQLITE)|' \
-e 's|@no_upnp@|$(NO_UPNP)|' \ -e 's|@no_upnp@|$(NO_UPNP)|' \
-e 's|@no_natpmp@|$(NO_NATPMP)|' \ -e 's|@no_natpmp@|$(NO_NATPMP)|' \
-e 's|@debug@|$(DEBUG)|' \ -e 's|@debug@|$(DEBUG)|' \

View File

@ -35,6 +35,14 @@ if test -z "$enable_wallet" && test -n "@no_wallet@"; then
enable_wallet=no enable_wallet=no
fi fi
if test -z "$with_bdb" && test -n "@no_bdb@"; then
with_bdb=no
fi
if test -z "$with_sqlite" && test -n "@no_sqlite@"; then
with_sqlite=no
fi
if test -z "$with_miniupnpc" && test -n "@no_upnp@"; then if test -z "$with_miniupnpc" && test -n "@no_upnp@"; then
with_miniupnpc=no with_miniupnpc=no
fi fi