-
Notifications
You must be signed in to change notification settings - Fork 36.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build: remove BOOST_CPPFLAGS usage from bitcoin-tx #26086
Conversation
The only reason BOOST_CPPFLAGS is needed here, is because of the policy/rbf.h include, which ultimately includes boost multi_index via txmempool.h. However this include is actually unused.
Nice. ACK f839697. As an aside, do any of our c-i runs actually test this? At least for depends, the boost headers are installed to the same prefix as everything else, meaning that Since boost is our only remaining external consensus dependency, as a follow-up, I'm wondering if we need a less hackish version of: theuni@e131d8f |
Agree. Right now a build will success even after |
At the moment, atleast a native macOS (M1) build will blow up, because (brew installed) Boost is in a "non-standard" path.
This isn't correct. Non-depends builds can/will fail. |
Agree, but it appears that the only system on which a build will fail is macOS M1 due to the reasons mentioned above. |
I'm happy for us to move in the direction suggested by Cory as a follow up. I think the current set of cpp changes (including the other PRs) are straightforward, and can be reviewed without changing depends (I'm also checking flag usage locally). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -15,7 +15,6 @@ | |||
#include <key_io.h> | |||
#include <fs.h> | |||
#include <policy/policy.h> | |||
#include <policy/rbf.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
iwyu reports:
bitcoin-tx.cpp should remove these lines:
- #include <policy/rbf.h> // lines 18-18
- #include <util/translation.h> // lines 29-29
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Going to leave this as is.
@theuni did you want to follow up to this with a PR? |
No-longer required after bitcoin#26086.
The only reason
BOOST_CPPFLAGS
was needed here, is because of thepolicy/rbf.h
include, which ultimately includes boost multi_index viatxmempool.h
. However this include is unused.