build: pass bdb cppflags only where needed #25244
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
Concept ACK. Is guarding with |
Member
|
Concept ACK |
Move bdb cppflags out of the catch-all BITCOIN_INCLUDES, and pass them only where they are needed, which is in libbitcoin_node/wallet and the tests.
fanquake
force-pushed
the
use_bdb_cppflags_needed
branch
from
6fd1f5e to
46a8909
Compare
Member
Author
dropped |
hebasto
approved these changes
Jun 1, 2022
Member
There was a problem hiding this comment.
ACK 46a8909
The <db_cxx.h> included in the wallet/bdb.h only. Therefore, BDB_CPPFLAGS are required only for libraries which sources have #include <wallet/bdb.h>.
nit, the following diff
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -177,6 +177,7 @@ FUZZ_SUITE_LD_COMMON +=\
if USE_BDB
BITCOIN_TESTS += wallet/test/db_tests.cpp
+test_test_bitcoin_CPPFLAGS += $(BDB_CPPFLAGS)
endif
FUZZ_WALLET_SRC = \
@@ -201,7 +202,6 @@ test_test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(TESTDEFS) $(EV
test_test_bitcoin_LDADD = $(LIBTEST_UTIL)
if ENABLE_WALLET
test_test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
-test_test_bitcoin_CPPFLAGS += $(BDB_CPPFLAGS)
endif
test_test_bitcoin_LDADD += $(LIBBITCOIN_NODE) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) \looks slightly more correct / clear?
Member
Author
Probably not, given that diff wouldn't compile |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move bdb cppflags out of the catch-all
BITCOIN_INCLUDES, and pass themonly where they are needed, which is in libbitcoin_node/wallet and the tests.