depends: Refresh ZeroMQ 4.3.1 patch #16927

pull nmarley wants to merge 1 commits into bitcoin:master from nmarley:btc-zmq431-patches changing 1 files +3 −3
  1. nmarley commented at 6:03 PM on September 20, 2019: contributor

    Currently in Alpine Linux (latest, 3.10) in the depends system, one of the ZeroMQ patches won't apply cleanly because the context around the patch has changed and Alpine's patch implementation can't handle the diff.

    Some patch implementations can't handle fuzz / too much divergence from the original code.

    This PR just tweaks the context code around the patch so that less-sophisticated patch implementations (such as on Alpine Linux) can apply the patch without errors.

    This partially fixes #16925

  2. Refresh ZeroMQ 4.3.1 patch
    Some patch implementations can't handle fuzz / too much divergence from the
original code.

This just tweaks the context code around the patch so that less-sophisticated
patch implementations (such as on Alpine Linux) can apply the patch without
errors.
    463a1d5244
  3. MarcoFalke added the label Build system on Sep 20, 2019
  4. MarcoFalke added the label Needs gitian build on Sep 20, 2019
  5. fanquake commented at 6:23 AM on September 21, 2019: member

    ACK 463a1d5244337915de36db36de573eb8782bc430 - Tested building zeromq in depends inside an Alpine container as well as on macOS. The changes in the zeromq source come from this commit . Also worth noting this wasn't an issue if you'd had the GNU patch installed on Alpine.

    /bitcoin # make zeromq -C depends/
make: Entering directory '/bitcoin/depends'
Extracting zeromq...
/bitcoin/depends/sources/zeromq-4.3.1.tar.gz: OK
Preprocessing zeromq...
patching file src/windows.hpp
patching file src/thread.cpp
Hunk 2 FAILED 323/323.
 #elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
     pthread_set_name_np (descriptor, name_);
 #endif
+#endif
+    return;
 }
 
 #endif
make: *** [funcs.mk:254: /bitcoin/depends/work/build/x86_64-pc-linux-gnu/zeromq/4.3.1-41472d87c95/.stamp_preprocessed] Error 1
make: Leaving directory '/bitcoin/depends'
/bitcoin # git fetch origin pull/16927/head:16927
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Total 6 (delta 5), reused 5 (delta 5), pack-reused 1
Unpacking objects: 100% (6/6), done.
From https://github.com/bitcoin/bitcoin
 * [new ref]             refs/pull/16927/head -> 16927
/bitcoin # git checkout 16927
Switched to branch '16927'
/bitcoin # make zeromq -C depends/
make: Entering directory '/bitcoin/depends'
Extracting zeromq...
/bitcoin/depends/sources/zeromq-4.3.1.tar.gz: OK
Preprocessing zeromq...
patching file src/windows.hpp
patching file src/thread.cpp
Configuring zeromq...
checking for a BSD-compatible install... /usr/bin/install -c
....
Postprocessing zeromq...
Caching zeromq...
make: Leaving directory '/bitcoin/depends'
  6. DrahtBot commented at 10:36 AM on September 21, 2019: member

    <!--a722867cd34abeea1fadc8d60700f111-->

    Gitian builds for commit f8b0b190aa9d13e93ebfe34b5655dbe8ed8df3d3 (master):

    Gitian builds for commit bbddbbfef8dd2915e004d94a6ff1e13f9cd32a63 (master and this pull):

  7. DrahtBot removed the label Needs gitian build on Sep 21, 2019
  8. nmarley commented at 2:13 PM on September 21, 2019: contributor

    Also worth noting this wasn't an issue if you'd had the GNU patch installed on Alpine.

    Ah, thanks for the info. I didn't realize it was as easy as using apk to install GNU patch. I wouldn't have opened if I had known, but at this point it probably won't hurt to shore up the patch since this is already in-progress.

  9. laanwj commented at 8:47 AM on September 25, 2019: member

    I think we should make sure that depends in travis uses a non-GNU patch, before merging this (if we decide that depends should support this). Otherwise this will come around and around again because the people bumping the versions are not going to test this obscure case.

  10. laanwj commented at 9:34 AM on September 30, 2019: member

    Going to merge this (to have it not miss 0.19 split-off), but reluctantly: I hope a check for this will be integrated into a CI at some point.

  11. laanwj referenced this in commit df692600c6 on Sep 30, 2019
  12. laanwj merged this on Sep 30, 2019
  13. laanwj closed this on Sep 30, 2019
  14. nmarley deleted the branch on Oct 1, 2019
  15. nmarley commented at 2:21 PM on October 1, 2019: contributor

    @laanwj Thanks for merging. I was going to ask how this could be accomplished but I see it's been addressed by adding busybox in another PR. 😄

  16. sidhujag referenced this in commit d9db597fe9 on Oct 2, 2019
  17. laanwj referenced this in commit 34919e0033 on Oct 8, 2019
  18. sidhujag referenced this in commit 9f8d364b59 on Oct 8, 2019
  19. deadalnix referenced this in commit 1a7a047db4 on Mar 31, 2020
  20. ftrader referenced this in commit 55c001e63f on Aug 13, 2021
  21. DrahtBot locked this on Dec 16, 2021
Contributors
nmarleyfanquakeDrahtBotlaanwj
Labels
Build system
Linked (view graph)
#16925 Alpine Linux 3.10 (latest stable) has some build issues w/dependencies#17011 ci: Use busybox utils for one build
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 09:14 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me