-
Notifications
You must be signed in to change notification settings - Fork 36.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Depends] Bump Boost, miniupnpc, ccache & zeromq #6980
Conversation
Interesting - upnpc fails on macosx:
|
Looks like they switched to using libtool for creating the static lib. "libtool" in this case is osx's library tool, not the gnu libtool it's finding. Thanks Apple! This should fix: diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk
index 8cda770..3d5a6df 100644
--- a/depends/packages/miniupnpc.mk
+++ b/depends/packages/miniupnpc.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash=f3cf9a5a31588a917d4d9237e5bc50f84d00c5aa48e27ed50d9b88dfa
define $(package)_set_vars
$(package)_build_opts=CC="$($(package)_cc)"
-$(package)_build_opts_darwin=OS=Darwin
+$(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)"
$(package)_build_opts_mingw32=-f Makefile.mingw
$(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)"
endef |
f766a7c
to
10d3c77
Compare
Added another commit with @theuni's miniupnpc fix. @theuni If we're bumping depends, are there any others we should look at for 0.12.0? The 4.0.x release of zeromq is now retired, with 4.1.3 being the latest. Should we bring our package (4.0.4) up to the latest release of the retired branch (4.0.7)? Or would we leave it and move to 4.1.x in future? |
@fanquake For libraries like ZMQ, which are still in quick iteration development, static linking is unfortunately kind of suboptimal. I'd say bump it, otherwise by the time 0.12 final is out we're speaking a dead language :) |
@theuni is this ok for merging? |
@theuni ping? |
ut ACK. |
e0769e1 [depends] Latest config.guess & config.sub (fanquake) 23a3c47 [depends] zeromq 4.0.7 (fanquake) 10d3c77 [depends] Fix miniupnpc compilation on osx (fanquake) 26f8ea5 [depends] native ccache 3.2.4 (fanquake) 17ad964 [depends] miniupnpc 1.9.20151026 (fanquake) 9e940fa [depends] Boost 1.59.0 (fanquake)
Bring dependencies up to date with master: [depends] Boost 1.59.0 [depends] miniupnpc 1.9.20151026 [depends] native ccache 3.2.4 [depends] zeromq 4.0.7 [depends] Latest config.guess & config.sub [depends] Fix miniupnpc compilation on osx Github-Pull: #6980 Rebased-From: 9e940fa 17ad964 26f8ea5 10d3c77 23a3c47 e0769e1
Add ZeroMQ notifications Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6103 - bitcoin/bitcoin#6684 - bitcoin/bitcoin#6686 - bitcoin/bitcoin#6736 - bitcoin/bitcoin#6739 - bitcoin/bitcoin#6743 - bitcoin/bitcoin#6768 - bitcoin/bitcoin#6779 - bitcoin/bitcoin#6810 - bitcoin/bitcoin#6927 - bitcoin/bitcoin#6980 (only upgrading zeromq) - bitcoin/bitcoin#6680 - bitcoin/bitcoin#7058 - bitcoin/bitcoin#7621 - bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7762 - bitcoin/bitcoin#7993 (only upgrading zeromq) - bitcoin/bitcoin#8238 - bitcoin/bitcoin#8701 - bitcoin/bitcoin#6685 Closes #2020.
Add ZeroMQ notifications Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6103 - bitcoin/bitcoin#6684 - bitcoin/bitcoin#6686 - bitcoin/bitcoin#6736 - bitcoin/bitcoin#6739 - bitcoin/bitcoin#6743 - bitcoin/bitcoin#6768 - bitcoin/bitcoin#6779 - bitcoin/bitcoin#6810 - bitcoin/bitcoin#6927 - bitcoin/bitcoin#6980 (only upgrading zeromq) - bitcoin/bitcoin#6680 - bitcoin/bitcoin#7058 - bitcoin/bitcoin#7621 - bitcoin/bitcoin#7335 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7853 (only parts affecting `zmq_test.py`) - bitcoin/bitcoin#7762 - bitcoin/bitcoin#7993 (only upgrading zeromq) - bitcoin/bitcoin#8238 - bitcoin/bitcoin#8701 - bitcoin/bitcoin#6685 Closes #2020.
Boost 1.59.0
Change-log
See #6937
Miniupnpc 1.9.20151026
Includes @laanwj's string handling/overflow fixes. See miniupnp/miniupnp#157
Changes:
ccache 3.2.4
Fixes a regression related to compiling on some Macs