highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#26087: build: prune BOOST_CPPFLAGS from libbitcoin_zmq

Browse Source 
a10df7cf35 build: prune BOOST_CPPFLAGS from libbitcoin_zmq (fanquake)

Pull request description:

  Rather than including `validation.h`, which ultimately means needing boost via `txmempool.h`, include `primitives/block.h` for `CBlock`, and remove `validation.h`, as we can get `cs_main` from `node/blockstorage.h`.

ACKs for top commit:
  theuni:
    Nice. ACK a10df7cf35.
  hebasto:
    ACK a10df7cf35, tested on Linux x86_64 using theuni's [patch](e131d8f1e3) with depends.

Tree-SHA512: 792b6f9e7e7788d10333b4943609efbc798f3b187c324a0f2d5acbb2d44e3c67705dc54d698eb04c23e5af7b8b73a47f8e7974e819eac12f12ae62f28c807476
This commit is contained in:
fanquake
2022-09-16 14:53:41 +01:00
parent 9fefd00d8e a10df7cf35
commit a688ff9046
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@@ -439,7 +439,7 @@ libbitcoin_node_a_SOURCES += dummywallet.cpp
endif endif
if ENABLE_ZMQ if ENABLE_ZMQ
libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) $(ZMQ_CFLAGS) libbitcoin_zmq_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libbitcoin_zmq_a_SOURCES = \ libbitcoin_zmq_a_SOURCES = \
zmq/zmqabstractnotifier.cpp \ zmq/zmqabstractnotifier.cpp \

2
src/zmq/zmqnotificationinterface.cpp
View File

@@ -8,7 +8,7 @@
#include <zmq.h> #include <zmq.h>
#include <validation.h> #include <primitives/block.h>
#include <util/system.h> #include <util/system.h>
CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(nullptr) CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(nullptr)

1
src/zmq/zmqpublishnotifier.cpp
View File

@@ -11,7 +11,6 @@
#include <rpc/server.h> #include <rpc/server.h>
#include <streams.h> #include <streams.h>
#include <util/system.h> #include <util/system.h>
#include <validation.h> // For cs_main
#include <zmq/zmqutil.h> #include <zmq/zmqutil.h>
#include <zmq.h> #include <zmq.h>