[22.x] build: Bump depends packages (zmq, libXau) #24256

pull fanquake wants to merge 4 commits into bitcoin:22.x from fanquake:backport_centos_8 changing 7 files +83 −10
  1. fanquake commented at 1:27 am on February 4, 2022: member
    Backports #24212 to the 22.x branch. Included a bump to libXau and an additional commit for zeromq to fix dash compatibility.
  2. fanquake added the label Tests on Feb 4, 2022
  3. fanquake added the label Backport on Feb 4, 2022
  4. hebasto commented at 7:31 am on February 4, 2022: member
    Looks like libXau 1.0.8 couldn’t be built with dash. Weird…
  5. build: libXau 1.0.9
    Github-Pull: #23489
    Rebased-From: fc65127244320500022c3772141850eda28b99af
    4b92a6b42c
  6. fanquake force-pushed on Feb 9, 2022
  7. maflcko renamed this:
    [22.x] ci: Backport CentOS 8
    [22.x] build: Bump depends packages (zmq, libXau)
    on Feb 9, 2022
  8. maflcko commented at 10:30 am on February 9, 2022: member
    Changed title
  9. fanquake commented at 10:30 am on February 9, 2022: member

    This branch works: https://github.com/hebasto/bitcoin/commits/pr24256-22.x/fixed

    I would rather not backport a full zmq bump to a release branch. Should have resolved this be just picking the relevant commit from upstream: https://github.com/zeromq/libzmq/pull/3518/commits/9a397666d28ca5f3c0d8233be3d39b2206555f45. Also rebased for #24215.

  10. maflcko commented at 10:31 am on February 9, 2022: member
    An alternative would be to simply not support dash and require CentOS 8 users to use bash
  11. in depends/packages/zeromq.mk:6 in b1e03fa413 outdated
    2@@ -3,7 +3,7 @@ $(package)_version=4.3.1
    3 $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
    4 $(package)_file_name=$(package)-$($(package)_version).tar.gz
    5 $(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
    6-$(package)_patches=remove_libstd_link.patch
    7+$(package)_patches=remove_libstd_link.patch fix_dash_compat.patch
    


    hebasto commented at 11:09 am on February 9, 2022:
    Apply patch in $(package)_preprocess_cmds?

    fanquake commented at 11:23 am on February 9, 2022:
    Thanks. Adjusted the patch as well.
  12. hebasto commented at 11:17 am on February 9, 2022: member

    An alternative would be to simply not support dash and require CentOS 8 users to use bash

    Concept ACK on supporting dash in CentOS.

  13. fanquake force-pushed on Feb 9, 2022
  14. fanquake force-pushed on Feb 14, 2022
  15. in depends/packages/zeromq.mk:22 in 37e8ea5753 outdated
    16@@ -17,7 +17,9 @@ endef
    17 
    18 define $(package)_preprocess_cmds
    19   patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \
    20-  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config
    21+  patch -p1 < $($(package)_patch_dir)/fix_dash_compat.patch && \
    22+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config && \
    23+  ./autogen.sh
    


    hebasto commented at 12:17 pm on February 14, 2022:
    Why ./autogen.sh is a part of $(package)_preprocess_cmds? On the master branch it belongs to $(package)_config_cmds:https://github.com/bitcoin/bitcoin/blob/3ce40e64d4ae9419658555fd1fb250b93f52684a/depends/packages/zeromq.mk#L27-L30

    fanquake commented at 1:47 pm on February 14, 2022:
    Changed.
  16. fanquake force-pushed on Feb 14, 2022
  17. build: fix depends zeromq dash compatibility
    Picks upstream commit 9a397666d28ca5f3c0d8233be3d39b2206555f45 to fix
    dash compatibility. This fixes building zeromq in our CentOS 8 CI. This
    is my preferred fix over backporting a zeromq update (which would
    contain this change).
    685ac6ad2e
  18. ci: Bump CentOS 8 image
    Github-Pull: #24212
    Rebased-From: fa5457e64adfc6060382bd36c45e95be6ea693ef
    b5d12edb08
  19. ci: Use dash when building depends in centos build
    Github-Pull: #24212
    Rebased-From: fafc55a489d8f654dd7732b699c9bf51b5136b4b
    d34691ce0c
  20. in depends/patches/zeromq/fix_dash_compat.patch:1 in 0075274c77 outdated
    0@@ -0,0 +1,71 @@
    1+commit 058158724b3003fa348a338a5b8f1d058dc59b99
    


    hebasto commented at 3:14 pm on February 14, 2022:

    fanquake commented at 4:54 pm on February 14, 2022:
    Changed to point to 9a397666d28ca5f3c0d8233be3d39b2206555f45.
  21. fanquake force-pushed on Feb 14, 2022
  22. hebasto approved
  23. hebasto commented at 9:57 pm on February 14, 2022: member
    ACK d34691ce0c07b5437c0e4fa9aea4afd699530151
  24. fanquake merged this on Feb 15, 2022
  25. fanquake closed this on Feb 15, 2022

  26. fanquake deleted the branch on Nov 9, 2022
  27. bitcoin locked this on Nov 9, 2023

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: 2024-10-30 00:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me