Skip to content

Commit d8ce27f

Browse files
committed
Merge #18397: build: Fix libevent linking for bench_bitcoin binary
cd04286 build: Fix typo in EVENT_CFLAGS variable (Hennadii Stepanov) f709ad0 build: Fix libevent linking for bench_bitcoin binary (Hennadii Stepanov) Pull request description: This change fixes `libevent` linking error for the `bench_bitcoin` binary. This PR is an alternative to #18377. Fix #18373. Also fixed a typo in `EVENT_CFLAGS` variable noted by **brakmic**. ACKs for top commit: fanquake: ACK cd04286 Tree-SHA512: a62f7457e86b11d3a55d603ea5d83f3a413792e2f28a0c72300e54d12591bd6f0acc1d76a4bd4b591e0223bc6d530e7a4b9a8b939fe2fdbf2dddfda5b1b537be
2 parents 2e97d80 + cd04286 commit d8ce27f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ if test x$use_pkgconfig = xyes; then
12551255
if test x$use_qr != xno; then
12561256
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
12571257
fi
1258-
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
1258+
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
12591259
PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
12601260
if test x$TARGET_OS != xwindows; then
12611261
PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
@@ -1275,7 +1275,7 @@ if test x$use_pkgconfig = xyes; then
12751275
)
12761276
else
12771277

1278-
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
1278+
if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then
12791279
AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
12801280
AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
12811281
if test x$TARGET_OS != xwindows; then

src/Makefile.bench.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ bench_bench_bitcoin_SOURCES = \
4343

4444
nodist_bench_bench_bitcoin_SOURCES = $(GENERATED_BENCH_FILES)
4545

46-
bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CLFAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
46+
bench_bench_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) -I$(builddir)/bench/
4747
bench_bench_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
4848
bench_bench_bitcoin_LDADD = \
4949
$(LIBBITCOIN_SERVER) \

0 commit comments

Comments
 (0)