Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#26087: build: prune BOOST_CPPFLAGS from libbitc…
Browse files Browse the repository at this point in the history
…oin_zmq

a10df7c 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 a10df7c.
  hebasto:
    ACK a10df7c, tested on Linux x86_64 using theuni's [patch](theuni/bitcoin@e131d8f) with depends.

Tree-SHA512: 792b6f9e7e7788d10333b4943609efbc798f3b187c324a0f2d5acbb2d44e3c67705dc54d698eb04c23e5af7b8b73a47f8e7974e819eac12f12ae62f28c807476
  • Loading branch information
fanquake committed Sep 16, 2022
2 parents 9fefd00 + a10df7c commit a688ff9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ libbitcoin_node_a_SOURCES += dummywallet.cpp
endif

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_SOURCES = \
zmq/zmqabstractnotifier.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/zmq/zmqnotificationinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <zmq.h>

#include <validation.h>
#include <primitives/block.h>
#include <util/system.h>

CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(nullptr)
Expand Down
1 change: 0 additions & 1 deletion src/zmq/zmqpublishnotifier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <rpc/server.h>
#include <streams.h>
#include <util/system.h>
#include <validation.h> // For cs_main
#include <zmq/zmqutil.h>

#include <zmq.h>
Expand Down

0 comments on commit a688ff9

Please sign in to comment.