[WIP][depends] ZeroMQ 4.1.5 && ZMQ on Windows#8238
Conversation
58ad9ec to
df23115
Compare
dc760be to
8c7c5a5
Compare
|
Nice. |
|
Compiled successfully on all three platforms: https://bitcoin.jonasschnelli.ch/pulls/8238/ |
|
@achow101 Given you opened #7943, are you able to download one of @jonasschnelli's test binaries and try using ZMQ ? |
|
@fanquake looks like it works on windows now. |
|
Concept ACK |
|
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. |
|
@fanquake Please have a look at theuni@a8d5faa . That takes the upstream commits, as well as disabling curve, which was necessary for me locally. |
8c7c5a5 to
6a08416
Compare
|
Updated with @theuni's suggestions |
|
Can someone on Windows @achow101, retest this? |
|
ACK 6a08416c5c1955a2ccec9bf393d829e1a4c34892 |
6a08416 to
a615386
Compare
a615386 [depends] ZeroMQ 4.1.5 (fanquake)
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.
a615386 [depends] ZeroMQ 4.1.5 (fanquake)
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:
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.