aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-09-01 10:28:27 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-01 10:28:33 +0200
commit107922663b9a53f37a0201ed2f211b1292b686bf (patch)
tree2cee619e19660eef69c6d79d247ad4f48e341217
parent01113f7b434f0e7a374449a289b3da398bbe4d2c (diff)
parentb144a74a08a856997f48a3c83f0bd080cf9432f9 (diff)
Merge pull request #4767
b144a74 depends: bump miniupnpc to 1.9.20140701. (Cory Fields) f628127 depends: bump openssl to 1.0.1i (Cory Fields) 9f7f504 build: add -DMINIUPNP_STATICLIB for new version (Cory Fields)
-rw-r--r--configure.ac3
-rw-r--r--depends/packages/miniupnpc.mk4
-rw-r--r--depends/packages/openssl.mk4
-rw-r--r--src/Makefile.am2
4 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 5a2d7e8e41..6dc71292df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,7 +690,7 @@ else
AC_MSG_RESULT($use_upnp_default)
AC_DEFINE_UNQUOTED([USE_UPNP],[$upnp_setting],[UPnP support not compiled if undefined, otherwise value (0 or 1) determines default state])
if test x$TARGET_OS = xwindows; then
- CPPFLAGS="$CPPFLAGS -DSTATICLIB"
+ MINIUPNPC_CPPFLAGS="-DSTATICLIB -DMINIUPNP_STATICLIB"
fi
else
AC_MSG_RESULT(no)
@@ -794,6 +794,7 @@ AC_SUBST(LEVELDB_TARGET_FLAGS)
AC_SUBST(BUILD_TEST)
AC_SUBST(BUILD_QT)
AC_SUBST(BUILD_TEST_QT)
+AC_SUBST(MINIUPNPC_CPPFLAGS)
AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist])
AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
AC_CONFIG_FILES([qa/pull-tester/build-tests.sh],[chmod +x qa/pull-tester/build-tests.sh])
diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk
index 6dd7d93b07..30f2d3f315 100644
--- a/depends/packages/miniupnpc.mk
+++ b/depends/packages/miniupnpc.mk
@@ -1,8 +1,8 @@
package=miniupnpc
-$(package)_version=1.9
+$(package)_version=1.9.20140701
$(package)_download_path=http://miniupnp.free.fr/files
$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464
+$(package)_sha256_hash=26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07
define $(package)_set_vars
$(package)_build_opts=CC="$($(package)_cc)"
diff --git a/depends/packages/openssl.mk b/depends/packages/openssl.mk
index 1fb8edb099..b1dcc6f81f 100644
--- a/depends/packages/openssl.mk
+++ b/depends/packages/openssl.mk
@@ -1,8 +1,8 @@
package=openssl
-$(package)_version=1.0.1h
+$(package)_version=1.0.1i
$(package)_download_path=https://www.openssl.org/source
$(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093
+$(package)_sha256_hash=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7
define $(package)_set_vars
$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
diff --git a/src/Makefile.am b/src/Makefile.am
index 655bfc88c3..35fca6570f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,7 +135,7 @@ obj/build.h: FORCE
libbitcoin_util_a-version.$(OBJEXT): obj/build.h
# server: shared between bitcoind and bitcoin-qt
-libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES)
+libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS)
libbitcoin_server_a_SOURCES = \
addrman.cpp \
alert.cpp \