Skip to content

[WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows #8238

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jul 30, 2016
Merged

[WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows #8238

merged 1 commit into from
Jul 30, 2016

Conversation

fanquake
Copy link
Member

This is an attempt to revive the work started by @theuni in #6819, and hopefully close issues #7943 and #6681.

Even if we still can't fix the Windows linking issues, it might be worth moving to the newer ZeroMQ version. Release notes as follows:

0MQ version 4.1.5 stable, released on 2016/06/17
================================================
* Fixed 1673 - CMake on Windows put PDB in wrong directory.
* Fixed 1723 - Family is not set when resolving NIC on Android.
* Fixed 1608 - Windows 7 TCP slow start issue.
* Fixed 1806 - uninitialised read in curve getsockopt.
* Fixed 1807 - build broken with GCC 6.
* Fixed 1831 - potential assertion failure with latest libsodium.
* Fixed 1850 - detection issues with tweetnacl/libsodium.
* Fixed 1877 - Avoid terminating connections prematurely
* Fixed 1887 - zmq_bind IPv4 fallback still tries IPv6
* Fixed 1866 - fails to build on SunOS 5.10 / Solaris 10
* Fixed 919 - ZMQ_LINGER (related to #1877)
* Fixed 114 - cannot unbind with same endpoint with IPv6 enabled.
* Fixed 1952 - CMake scripts not part of release tarballs
* Fixed 1542 - Fix a crash on Windows when port 5905 is in use.
* Fixed 2021 - Fix building on sparc32.

The changes to enable static linking in ZeroMQ have been made in #1615 and then a follow up in #1978 / #1979.

We no longer need the headergaurd patch from #6819, as those changes seem to be in src/windows.hpp. Introduced in #901.

Hopefully pulling all this info together means we can get this working.

@fanquake fanquake force-pushed the depends-zeromq-4-1-5 branch from 58ad9ec to df23115 Compare June 22, 2016 10:20
@fanquake fanquake force-pushed the depends-zeromq-4-1-5 branch 5 times, most recently from dc760be to 8c7c5a5 Compare June 22, 2016 12:06
@jonasschnelli
Copy link
Contributor

Nice.
Started a gitian build: https://bitcoin.jonasschnelli.ch/pulls/8238/

@jonasschnelli
Copy link
Contributor

Compiled successfully on all three platforms: https://bitcoin.jonasschnelli.ch/pulls/8238/

@fanquake
Copy link
Member Author

@achow101 Given you opened #7943, are you able to download one of @jonasschnelli's test binaries and try using ZMQ ?

@achow101
Copy link
Member

@fanquake looks like it works on windows now.

@sipa
Copy link
Member

sipa commented Jun 24, 2016

Concept ACK

@theuni
Copy link
Member

theuni commented Jun 28, 2016

Concept ACK. I'd prefer going a slightly different route, though.

Upstream removed the mingw requirement here: zeromq/libzmq@9114d39 and a fixup here: zeromq/libzmq@9e6745c .

I'd prefer to take those patches directly. Then we can simply drop the patches when we update to a release that includes them.

@theuni
Copy link
Member

theuni commented Jul 6, 2016

@fanquake Please have a look at theuni@a8d5faa . That takes the upstream commits, as well as disabling curve, which was necessary for me locally.

@fanquake fanquake force-pushed the depends-zeromq-4-1-5 branch from 8c7c5a5 to 6a08416 Compare July 8, 2016 01:46
@fanquake
Copy link
Member Author

fanquake commented Jul 8, 2016

Updated with @theuni's suggestions

@fanquake
Copy link
Member Author

fanquake commented Jul 13, 2016 •
edited
Loading

Can someone on Windows @achow101, retest this?

@achow101
Copy link
Member

ACK 6a08416c5c1955a2ccec9bf393d829e1a4c34892

@fanquake fanquake force-pushed the depends-zeromq-4-1-5 branch from 6a08416 to a615386 Compare July 21, 2016 08:20
@laanwj laanwj merged commit a615386 into bitcoin:master Jul 30, 2016
laanwj added a commit that referenced this pull request Jul 30, 2016
@laanwj
Merge #8238: [WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows
6caf3ee 
a615386 [depends] ZeroMQ 4.1.5 (fanquake)
@fanquake fanquake deleted the depends-zeromq-4-1-5 branch August 1, 2016 01:35
@fanquake fanquake mentioned this pull request Aug 6, 2016
Closed
18 tasks
This was referenced Sep 2, 2016
Closed
Closed
@str4d str4d mentioned this pull request Jan 31, 2017
Merged
zkbot added a commit to zcash/zcash that referenced this pull request Feb 9, 2017
@zkbot
Auto merge of #2050 - str4d:2020-zmq, r=<try>
dd8b383 
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.
zkbot added a commit to zcash/zcash that referenced this pull request Feb 9, 2017
@zkbot
Auto merge of #2050 - str4d:2020-zmq, r=bitcartel
253c610 
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.
codablock pushed a commit to codablock/dash that referenced this pull request Jan 8, 2018
@laanwj @codablock
Merge bitcoin#8238: [WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows
eb54680 
a615386 [depends] ZeroMQ 4.1.5 (fanquake)
@hebasto hebasto mentioned this pull request Jul 2, 2020
Merged
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@theuni theuni

Labels
Build system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@fanquake @jonasschnelli @achow101 @sipa @theuni @laanwj @maflcko