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

Fix gitian build after libzmq bump #11981

Merged
merged 1 commit into from Dec 22, 2017

Conversation

Projects
None yet
4 participants
@theuni
Member

theuni commented Dec 21, 2017

Broken gitian builds were introduced with #9254. Big thanks to @jonasschnelli for narrowing down the bisection.

This is broken for a number of reasons, including:

  • g++ understands "-static-libstdc++ -lstdc++" to mean "link against whatever libstdc++ exists, probably shared", which in itself is buggy.
  • another stdlib (libc++ for example) may be in use
depends: fix libzmq's needless linking against libstdc++
This is broken for a number of reasons, including:
- g++ understands "-static-libstdc++ -lstdc++" to mean "link against whatever
  libstdc++ exists, probably shared", which in itself is buggy.
- another stdlib (libc++ for example) may be in use
@jonasschnelli

This comment has been minimized.

Member

jonasschnelli commented Dec 21, 2017

Let's see
Just started https://bitcoin.jonasschnelli.ch/build/431

We should probably always test depends changes with a gitian build.

@fanquake

This comment has been minimized.

Member

fanquake commented Dec 22, 2017

I'm wondering, before we fix this, should we update to 4.2.3 and see if anything else breaks?
It was only recently released, which is why it wasn't in #9254, and basically includes a years worth of bug fixes, which I think would be good to get in.

Note: We'd want to look at patching for OpenBSD: zeromq/libzmq@22b57f6

@theuni

This comment has been minimized.

Member

theuni commented Dec 22, 2017

Sure, though I checked upstream master before creating the patch here, in case there was something to backport (and also to file a bug report, which I haven't done yet).

So this fix should work with 4.2.3. as well.

Re OpenBSD, we don't currently build releases, so no need to worry about that patch.

@jonasschnelli

This comment has been minimized.

Member

jonasschnelli commented Dec 22, 2017

Fixed the gitian build (https://bitcoin.jonasschnelli.ch/build/431).
Tested ACK a6365c5

@laanwj

This comment has been minimized.

Member

laanwj commented Dec 22, 2017

This one is extremely sneaky. Why the hell would they do this?
utACK a6365c5

Re OpenBSD, we don't currently build releases, so no need to worry about that patch.

Indeed, and zeromq package is easy to install from the ports/pkg_add system for people building from source.

@laanwj laanwj merged commit a6365c5 into bitcoin:master Dec 22, 2017

1 check passed

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

laanwj added a commit that referenced this pull request Dec 22, 2017

Merge #11981: Fix gitian build after libzmq bump
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with #9254. Big thanks to @jonasschnelli for narrowing down the bisection.

  This is broken for a number of reasons, including:
  - g++ understands "-static-libstdc++ -lstdc++" to mean "link against whatever libstdc++ exists, probably shared", which in itself is buggy.
  - another stdlib (libc++ for example) may be in use

Tree-SHA512: d84968ee680f32ea799034ee516e9477fff2b1ef1b7c9a8ef1941631520ab196ecd50f5d64f3ed1c84113ead44be5e3ddf6ff2ae0277625bdeed05f1da89e017

@fanquake fanquake referenced this pull request Dec 22, 2017

Merged

[depends] zeromq 4.2.3 #11986

0 of 3 tasks complete

laanwj added a commit that referenced this pull request Mar 6, 2018

Merge #11986: [depends] zeromq 4.2.3
13a399a depends: patch pthread_set_name_np out of zeromq (Cory Fields)
8f79226 depends: zeromq 4.2.3 (fanquake)

Pull request description:

  This is a followup to #9254 and #11981. Zeromq 4.2.3 was released just after #9254 was merged, and contains a years worth of improvements/bug fixes. See the release notes [here](https://github.com/zeromq/libzmq/releases/tag/v4.2.3).

  Todo:
  - [ ] Add zeromq-4.2.3.tar.gz to /depends-sources on bitcoincore.org
  - [ ] Verify gitian builds are still OK
  - [ ] Check: zeromq/libzmq#2787

Tree-SHA512: 85e06f47be3e1fdedcee50ce90e3391d69df2ea1c167472ffc3126d8970d418eb75141b970e422eb2fda9a8cad00e6ba5b36afa53565171a9ebaa152a9dc9b60

@sickpig sickpig referenced this pull request Jun 5, 2018

Merged

[PORT] Depends cherries #1120

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