Skip to content

Commit 7af2502

Browse files
committed
build: compile libnatpmp with -DNATPMP_STATICLIB on Windows
This fixes linking issues and mirrors what we do with miniupnpc.
1 parent ee35745 commit 7af2502

File tree

5 files changed

+8
-3
lines changed

5 files changed

+8
-3
lines changed

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,9 @@ else
16691669
fi
16701670
AC_MSG_RESULT($use_natpmp_default)
16711671
AC_DEFINE_UNQUOTED([USE_NATPMP], [$natpmp_setting], [NAT-PMP support not compiled if undefined, otherwise value (0 or 1) determines default state])
1672+
if test x$TARGET_OS = xwindows; then
1673+
NATPMP_CPPFLAGS="-DSTATICLIB -DNATPMP_STATICLIB"
1674+
fi
16721675
else
16731676
AC_MSG_RESULT([no])
16741677
fi
@@ -1826,6 +1829,7 @@ AC_SUBST(SQLITE_LIBS)
18261829
AC_SUBST(TESTDEFS)
18271830
AC_SUBST(MINIUPNPC_CPPFLAGS)
18281831
AC_SUBST(MINIUPNPC_LIBS)
1832+
AC_SUBST(NATPMP_CPPFLAGS)
18291833
AC_SUBST(NATPMP_LIBS)
18301834
AC_SUBST(EVENT_LIBS)
18311835
AC_SUBST(EVENT_PTHREADS_LIBS)

depends/packages/libnatpmp.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ $(package)_sha256_hash=543b460aab26acf91e11d15e17d8798f845304199eea2d76c2f444ec7
66

77
define $(package)_set_vars
88
$(package)_build_opts=CC="$($(package)_cc)"
9+
$(package)_build_opts_mingw32=CPPFLAGS=-DNATPMP_STATICLIB
910
$(package)_build_opts_darwin=LIBTOOL="$($(package)_libtool)"
1011
$(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)"
1112
endef

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
302302
# Contains code accessing mempool and chain state that is meant to be separated
303303
# from wallet and gui code (see node/README.md). Shared code should go in
304304
# libbitcoin_common or libbitcoin_util libraries, instead.
305-
libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
305+
libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
306306
libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
307307
libbitcoin_server_a_SOURCES = \
308308
addrdb.cpp \

src/Makefile.test_fuzz.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ TEST_FUZZ_H = \
1212
test/fuzz/FuzzedDataProvider.h \
1313
test/fuzz/util.h
1414

15-
libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
15+
libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
1616
libtest_fuzz_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
1717
libtest_fuzz_a_SOURCES = \
1818
test/fuzz/fuzz.cpp \

src/Makefile.test_util.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TEST_UTIL_H = \
1919
test/util/validation.h \
2020
test/util/wallet.h
2121

22-
libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
22+
libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
2323
libtest_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
2424
libtest_util_a_SOURCES = \
2525
test/util/blockfilter.cpp \

0 commit comments

Comments
 (0)