Skip to content
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] ZeroMQ 4.2.2 #9254

Merged
merged 2 commits into from Nov 30, 2017
Merged

[depends] ZeroMQ 4.2.2 #9254

merged 2 commits into from Nov 30, 2017

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Dec 1, 2016

Update depends ZeroMQ to 4.2.2, the release notes are available here.

We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release).

--without-documentation is deprecated and has been replaced with --without-docs.
--disable-perf disables building performance measuring tools, which are enabled by default, see the libzmq configure.ac.
Updated dependencies.md.
--disable-curve-keygen disable building the curve key generation tool. See here.

Can someone on windows test that this is still working correctly. Maybe @achow101 ?

@jonasschnelli
Copy link
Contributor

Travis Windows (depends build) is failing.
I think you need to adopt the MinGW static patches instead of removing.

@fanquake
Copy link
Member Author

fanquake commented Dec 2, 2016

The patches were only turning this line: AC_MSG_ERROR([Building static libraries is not supported under MinGW32]) into CPPFLAGS="-DZMQ_STATIC $CPPFLAGS" (in two steps, as we wanted to use the commits from upstream). The new configure.ac now contains both patches, see here, so I think this is a different issue. Will investigate shortly.

/usr/share/mingw-w64/include/netioapi.h:458:3: error: ‘SOCKADDR_INET’ has not been declared
   SOCKADDR_INET *BestSourceAddress
   ^
In file included from /usr/share/mingw-w64/include/iphlpapi.h:16:0,
                 from src/windows.hpp:58,
                 from src/precompiled.hpp:37,
                 from src/address.cpp:30:
/usr/share/mingw-w64/include/netioapi.h:585:9: error: ‘SOCKADDR_INET’ does not name a type
   const SOCKADDR_INET *SourceAddress
         ^
In file included from src/windows.hpp:58:0,
                 from src/precompiled.hpp:37,
                 from src/address.cpp:30:
/usr/share/mingw-w64/include/iphlpapi.h:147:5: error: ‘SOCKADDR_IN6’ does not name a type
     SOCKADDR_IN6 Ipv6Address;
     ^

@fanquake
Copy link
Member Author

fanquake commented Jan 4, 2017

Pushed a commit to update to the latest point release (4.2.1), may also help with these issues.

@fanquake fanquake changed the title [depends] ZeroMQ 4.2.0 [depends] ZeroMQ 4.2.1 Jan 4, 2017
@laanwj
Copy link
Member

laanwj commented Jan 5, 2017

Still the SOCKADDR_INET issue on win32/64

@fanquake fanquake changed the title [depends] ZeroMQ 4.2.1 [depends] ZeroMQ 4.2.2 Feb 19, 2017
@laanwj
Copy link
Member

laanwj commented Apr 3, 2017

Seems this is blocked by an upstream issue?

@laanwj laanwj added the Upstream label Apr 3, 2017
@fanquake fanquake force-pushed the zeromq-4-2-0 branch 3 times, most recently from a543122 to b598a4a Compare April 27, 2017 08:58
@fanquake fanquake mentioned this pull request May 3, 2017
@fanquake fanquake force-pushed the zeromq-4-2-0 branch 3 times, most recently from 0b862a9 to c87403c Compare May 13, 2017 05:20
@laanwj laanwj added this to the 0.16.0 milestone Aug 23, 2017
@fanquake fanquake force-pushed the zeromq-4-2-0 branch 5 times, most recently from 6feca2f to 7a49c06 Compare September 10, 2017 07:00
@TheBlueMatt
Copy link
Contributor

Has the issue been reported upstream? Any closer to resolving this one?

@fanquake
Copy link
Member Author

fanquake commented Oct 6, 2017

@theuni Can you take a look here you have a chance? We discussed setting WINNT a while back.

@fanquake
Copy link
Member Author

Added --disable-curve-keygen to our configure options. This option disables building the curve key generation tool, see the zeromq configure.ac.

@theuni
Copy link
Member

theuni commented Nov 29, 2017

Sure, utACK 126999d.

@laanwj laanwj merged commit 126999d into bitcoin:master Nov 30, 2017
laanwj added a commit that referenced this pull request Nov 30, 2017
126999d depends: fix zmq build with mingw < 4.0 (Cory Fields)
387879d [depends] ZeroMQ 4.2.2 (fanquake)

Pull request description:

  Update depends ZeroMQ to 4.2.2, the release notes are available [here](https://github.com/zeromq/libzmq/releases).

  We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release).

  `--without-documentation` is deprecated and has been replaced with `--without-docs`.
  `--disable-perf` disables building performance measuring tools, which are enabled by default, see the libzmq [configure.ac](https://github.com/zeromq/libzmq/blob/master/configure.ac#L367).
  Updated dependencies.md.
  `--disable-curve-keygen` disable building the curve key generation tool. See [here](https://github.com/zeromq/libzmq/blob/master/configure.ac#L405).

  Can someone on windows test that this is still working correctly. Maybe @achow101 ?

Tree-SHA512: c6c4b15f545b6de21648f05027b5500fca0e6b5b72e791ac9a0aa523c57f2feb5aae94e42531275dddd922e11e462a52f08be1118ba1629c3cae765b18e5d720
laanwj added a commit that referenced this pull request Dec 22, 2017
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 mentioned this pull request Dec 22, 2017
3 tasks
laanwj added a commit that referenced this pull request Mar 6, 2018
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
@fanquake fanquake deleted the zeromq-4-2-0 branch December 16, 2019 20:18
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 14, 2020
126999d depends: fix zmq build with mingw < 4.0 (Cory Fields)
387879d [depends] ZeroMQ 4.2.2 (fanquake)

Pull request description:

  Update depends ZeroMQ to 4.2.2, the release notes are available [here](https://github.com/zeromq/libzmq/releases).

  We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release).

  `--without-documentation` is deprecated and has been replaced with `--without-docs`.
  `--disable-perf` disables building performance measuring tools, which are enabled by default, see the libzmq [configure.ac](https://github.com/zeromq/libzmq/blob/master/configure.ac#L367).
  Updated dependencies.md.
  `--disable-curve-keygen` disable building the curve key generation tool. See [here](https://github.com/zeromq/libzmq/blob/master/configure.ac#L405).

  Can someone on windows test that this is still working correctly. Maybe @achow101 ?

Tree-SHA512: c6c4b15f545b6de21648f05027b5500fca0e6b5b72e791ac9a0aa523c57f2feb5aae94e42531275dddd922e11e462a52f08be1118ba1629c3cae765b18e5d720
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 14, 2020
126999d depends: fix zmq build with mingw < 4.0 (Cory Fields)
387879d [depends] ZeroMQ 4.2.2 (fanquake)

Pull request description:

  Update depends ZeroMQ to 4.2.2, the release notes are available [here](https://github.com/zeromq/libzmq/releases).

  We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release).

  `--without-documentation` is deprecated and has been replaced with `--without-docs`.
  `--disable-perf` disables building performance measuring tools, which are enabled by default, see the libzmq [configure.ac](https://github.com/zeromq/libzmq/blob/master/configure.ac#L367).
  Updated dependencies.md.
  `--disable-curve-keygen` disable building the curve key generation tool. See [here](https://github.com/zeromq/libzmq/blob/master/configure.ac#L405).

  Can someone on windows test that this is still working correctly. Maybe @achow101 ?

Tree-SHA512: c6c4b15f545b6de21648f05027b5500fca0e6b5b72e791ac9a0aa523c57f2feb5aae94e42531275dddd922e11e462a52f08be1118ba1629c3cae765b18e5d720
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Mar 27, 2020
Summary:
```
Update depends ZeroMQ to 4.2.2, the release notes are available here.

We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release).

--without-documentation is deprecated and has been replaced with --without-docs.
--disable-perf disables building performance measuring tools, which are enabled by default, see the libzmq configure.ac.
Updated dependencies.md.
--disable-curve-keygen disable building the curve key generation tool. See here.
```

Backport of core [[bitcoin/bitcoin#9254 | PR9254]] and [[bitcoin/bitcoin#11981 | PR11981]] (related bugfix).

Depends on D5577.

Test Plan: Run the Gitian builds.

Reviewers: #bitcoin_abc, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Subscribers: jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D5574
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 27, 2020
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 28, 2020
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 29, 2020
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Mar 31, 2020
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Mar 31, 2020
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Apr 1, 2020
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
10xcryptodev pushed a commit to 10xcryptodev/dash that referenced this pull request May 16, 2020
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 bitcoin#9254 and bitcoin#11981. Zeromq 4.2.3 was released just after bitcoin#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
(cherry picked from commit 765a3eb)

# Conflicts:
#	doc/dependencies.md
10xcryptodev pushed a commit to 10xcryptodev/dash that referenced this pull request May 17, 2020
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 bitcoin#9254 and bitcoin#11981. Zeromq 4.2.3 was released just after bitcoin#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
(cherry picked from commit 765a3eb)

# Conflicts:
#	doc/dependencies.md
@str4d str4d mentioned this pull request Oct 5, 2020
zkbot added a commit to zcash/zcash that referenced this pull request Oct 8, 2020
Update ZeroMQ

Includes changes cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#9254
- bitcoin/bitcoin#13578
- bitcoin/bitcoin#15844
- bitcoin/bitcoin#16370
  - Only the ZeroMQ changes.
- bitcoin/bitcoin#16949
gades pushed a commit to cosanta/cosanta-core that referenced this pull request Jun 24, 2021
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 bitcoin#9254 and bitcoin#11981. Zeromq 4.2.3 was released just after bitcoin#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
(cherry picked from commit 765a3eb)

# Conflicts:
#	doc/dependencies.md
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Jul 2, 2021
126999d depends: fix zmq build with mingw < 4.0 (Cory Fields)
387879d [depends] ZeroMQ 4.2.2 (fanquake)

Pull request description:

  Update depends ZeroMQ to 4.2.2, the release notes are available 
[here](https://github.com/zeromq/libzmq/releases).

  We can drop both patches, as they have both been merged upstream (they 
actually had been for some time but just hadn't yet made it into a 
release).

  `--without-documentation` is deprecated and has been replaced with 
`--without-docs`.
  `--disable-perf` disables building performance measuring tools, which 
are enabled by default, see the libzmq 
[configure.ac](https://github.com/zeromq/libzmq/blob/master/configure.ac#L367).
  Updated dependencies.md.
  `--disable-curve-keygen` disable building the curve key generation 
tool. See 
[here](https://github.com/zeromq/libzmq/blob/master/configure.ac#L405).

  Can someone on windows test that this is still working correctly. 
Maybe @achow101 ?

Tree-SHA512: 
c6c4b15f545b6de21648f05027b5500fca0e6b5b72e791ac9a0aa523c57f2feb5aae94e42531275dddd922e11e462a52f08be1118ba1629c3cae765b18e5d720
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Jul 2, 2021
a6365c5 depends: fix libzmq's needless linking against libstdc++ (Cory Fields)

Pull request description:

  Broken gitian builds were introduced with bitcoin#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
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Jul 2, 2021
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 bitcoin#9254 and bitcoin#11981. Zeromq 4.2.3 was released just after bitcoin#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
(cherry picked from commit 765a3eb)

# Conflicts:
#	doc/dependencies.md
ftrader pushed a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this pull request Aug 13, 2021
Summary:
```
Update depends ZeroMQ to 4.2.2, the release notes are available here.

We can drop both patches, as they have both been merged upstream (they actually had been for some time but just hadn't yet made it into a release).

--without-documentation is deprecated and has been replaced with --without-docs.
--disable-perf disables building performance measuring tools, which are enabled by default, see the libzmq configure.ac.
Updated dependencies.md.
--disable-curve-keygen disable building the curve key generation tool. See here.
```

Backport of core [[bitcoin/bitcoin#9254 | PR9254]] and [[bitcoin/bitcoin#11981 | PR11981]] (related bugfix).

Depends on D5577.

Test Plan: Run the Gitian builds.

Reviewers: #bitcoin_abc, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Subscribers: jasonbcox

Differential Revision: https://reviews.bitcoinabc.org/D5574
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants