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

Merged
merged 6 commits into from Dec 18, 2015

Conversation

Projects
None yet
3 participants
@fanquake
Member

fanquake commented Nov 10, 2015

Boost 1.59.0
Change-log
See #6937

Miniupnpc 1.9.20151026
Includes @laanwj's string handling/overflow fixes. See miniupnp/miniupnp#157
Changes:

2015/10/26:
  snprintf() overflow check. check overflow in simpleUPnPcommand2()
2015/10/25:
  fix compilation with old macs
  fix compilation with mingw32 (for Appveyor)
  fix python module for python <= 2.3

ccache 3.2.4
Fixes a regression related to compiling on some Macs

Fixed build error related to zlib on systems with older make versions (regression in ccache 3.2.3).
Made conversion-to-bool explicit to avoid build warnings (and potential runtime errors) on legacy systems.
Improved signal handling: Kill compiler on SIGTERM; wait for compiler to exit before exiting; die appropriately.
Minor fixes related to Windows support.
The correct compression level is now used if compression is requested.
Fixed a bug where cache cleanup could be run too early for caches larger than 64 GiB on 32-bit systems.
@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Nov 10, 2015

Member

Interesting - upnpc fails on macosx:

clang -target x86_64-apple-darwin11 -mmacosx-version-min=10.7 --sysroot /home/travis/build/bitcoin/bitcoin/depends/SDKs/MacOSX10.9.sdk -mlinker-version=241.9 -D_DARWIN_C_SOURCE -fPIC -pipe -O2 -I/home/travis/build/bitcoin/bitcoin/depends/x86_64-apple-darwin11/include -Wall -W -Wstrict-prototypes -fno-common -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE   -c -o minissdpc.o minissdpc.c
/usr/bin/libtool -static -o libminiupnpc.a miniwget.o minixml.o igd_desc_parse.o minisoap.o miniupnpc.o upnpreplyparse.o upnpcommands.o upnperrors.o connecthostport.o portlistingparse.o receivedata.o upnpdev.o minissdpc.o
libtool: unrecognized option `-static'
libtool: Try `libtool --help' for more information.
make[1]: *** [libminiupnpc.a] Error 1
make[1]: Leaving directory `/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-apple-darwin11/miniupnpc/1.9.20151026-02b712d842a'
make: *** [/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-apple-darwin11/miniupnpc/1.9.20151026-02b712d842a/./.stamp_built] Error 2
make: Leaving directory `/home/travis/build/bitcoin/bitcoin/depends
Member

laanwj commented Nov 10, 2015

Interesting - upnpc fails on macosx:

clang -target x86_64-apple-darwin11 -mmacosx-version-min=10.7 --sysroot /home/travis/build/bitcoin/bitcoin/depends/SDKs/MacOSX10.9.sdk -mlinker-version=241.9 -D_DARWIN_C_SOURCE -fPIC -pipe -O2 -I/home/travis/build/bitcoin/bitcoin/depends/x86_64-apple-darwin11/include -Wall -W -Wstrict-prototypes -fno-common -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE   -c -o minissdpc.o minissdpc.c
/usr/bin/libtool -static -o libminiupnpc.a miniwget.o minixml.o igd_desc_parse.o minisoap.o miniupnpc.o upnpreplyparse.o upnpcommands.o upnperrors.o connecthostport.o portlistingparse.o receivedata.o upnpdev.o minissdpc.o
libtool: unrecognized option `-static'
libtool: Try `libtool --help' for more information.
make[1]: *** [libminiupnpc.a] Error 1
make[1]: Leaving directory `/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-apple-darwin11/miniupnpc/1.9.20151026-02b712d842a'
make: *** [/home/travis/build/bitcoin/bitcoin/depends/work/build/x86_64-apple-darwin11/miniupnpc/1.9.20151026-02b712d842a/./.stamp_built] Error 2
make: Leaving directory `/home/travis/build/bitcoin/bitcoin/depends
@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Nov 10, 2015

Member

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
Member

theuni commented Nov 10, 2015

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
@fanquake

This comment has been minimized.

Show comment
Hide comment
@fanquake

fanquake Nov 11, 2015

Member

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?

Member

fanquake commented Nov 11, 2015

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?

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Nov 11, 2015

Member

@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 :)

Member

laanwj commented Nov 11, 2015

@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 :)

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Nov 16, 2015

Member

@theuni is this ok for merging?

Member

laanwj commented Nov 16, 2015

@theuni is this ok for merging?

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Dec 3, 2015

Member

@theuni ping?

Member

laanwj commented Dec 3, 2015

@theuni ping?

@fanquake fanquake changed the title from [Depends] Bump Boost, miniupnpc & ccache to [Depends] Bump Boost, miniupnpc, ccache & zeromq Dec 4, 2015

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Dec 4, 2015

Member

ut ACK.

Member

theuni commented Dec 4, 2015

ut ACK.

@fanquake

This comment has been minimized.

Show comment
Hide comment
@fanquake

fanquake Dec 9, 2015

Member

@laanwj @theuni I've added another commit that updates config.guess and config.sub to their latest revisions. Minor changes to both files.

Member

fanquake commented Dec 9, 2015

@laanwj @theuni I've added another commit that updates config.guess and config.sub to their latest revisions. Minor changes to both files.

@laanwj laanwj merged commit e0769e1 into bitcoin:master Dec 18, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Dec 18, 2015

Merge pull request #6980
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)

laanwj added a commit that referenced this pull request Dec 18, 2015

[Depends] Bump Boost, miniupnpc, ccache & zeromq
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

@fanquake fanquake deleted the fanquake:depends-bump-boost branch May 12, 2016

@str4d str4d referenced this pull request Jan 31, 2017

Merged

Add ZeroMQ notifications #2050

zkbot added a commit to zcash/zcash that referenced this pull request Feb 9, 2017

zkbot added a commit to zcash/zcash that referenced this pull request Feb 9, 2017

zkbot added a commit to zcash/zcash that referenced this pull request Feb 9, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment