sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#21209: use newer source for libnatpmp

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-02-17 15:06:30 +08:00
parent d23a3c8af8
commit c382730033
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1637,6 +1637,9 @@ else
fi fi
AC_MSG_RESULT($use_natpmp_default) AC_MSG_RESULT($use_natpmp_default)
AC_DEFINE_UNQUOTED([USE_NATPMP], [$natpmp_setting], [NAT-PMP support not compiled if undefined, otherwise value (0 or 1) determines default state]) AC_DEFINE_UNQUOTED([USE_NATPMP], [$natpmp_setting], [NAT-PMP support not compiled if undefined, otherwise value (0 or 1) determines default state])
if test x$TARGET_OS = xwindows; then
NATPMP_CPPFLAGS="-DSTATICLIB -DNATPMP_STATICLIB"
fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
@ -1818,6 +1821,7 @@ AC_SUBST(MINIUPNPC_LIBS)
AC_SUBST(CRYPTO_LIBS) AC_SUBST(CRYPTO_LIBS)
AC_SUBST(SSL_LIBS) AC_SUBST(SSL_LIBS)
AC_SUBST(GMP_LIBS) AC_SUBST(GMP_LIBS)
AC_SUBST(NATPMP_CPPFLAGS)
AC_SUBST(NATPMP_LIBS) AC_SUBST(NATPMP_LIBS)
AC_SUBST(EVENT_LIBS) AC_SUBST(EVENT_LIBS)
AC_SUBST(EVENT_PTHREADS_LIBS) AC_SUBST(EVENT_PTHREADS_LIBS)

10
depends/packages/libnatpmp.mk
View File

@ -1,11 +1,13 @@
package=libnatpmp package=libnatpmp
$(package)_version=20150609 $(package)_version=4536032ae32268a45c073a4d5e91bbab4534773a
$(package)_download_path=https://miniupnp.tuxfamily.org/files/ $(package)_download_path=https://github.com/miniupnp/libnatpmp/archive
$(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_file_name=$($(package)_version).tar.gz
$(package)_sha256_hash=e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 $(package)_sha256_hash=543b460aab26acf91e11d15e17d8798f845304199eea2d76c2f444ec749c5383
define $(package)_set_vars define $(package)_set_vars
$(package)_build_opts=CC="$($(package)_cc)" $(package)_build_opts=CC="$($(package)_cc)"
$(package)_build_opts_mingw32=CPPFLAGS=-DNATPMP_STATICLIB
$(package)_build_opts_darwin=LIBTOOL="$($(package)_libtool)"
$(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)" $(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)"
endef endef

2
src/Makefile.am
View File

@ -341,7 +341,7 @@ libdash_util_a-clientversion.$(OBJEXT): obj/build.h
# Contains code accessing mempool and chain state that is meant to be separated # Contains code accessing mempool and chain state that is meant to be separated
# from wallet and gui code (see node/README.md). Shared code should go in # from wallet and gui code (see node/README.md). Shared code should go in
# libdash_common or libdash_util libraries, instead. # libdash_common or libdash_util libraries, instead.
libdash_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) libdash_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
libdash_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libdash_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
libdash_server_a_SOURCES = \ libdash_server_a_SOURCES = \
addrdb.cpp \ addrdb.cpp \