Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Feb 4, 2022

Backports #24212 to the 22.x branch. Included a bump to libXau and an additional commit for zeromq to fix dash compatibility.

@hebasto
Copy link
Member

hebasto commented Feb 4, 2022

Looks like libXau 1.0.8 couldn't be built with dash. Weird...

@hebasto
Copy link
Member

hebasto commented Feb 6, 2022

Github-Pull: bitcoin#23489
Rebased-From: fc65127
@maflcko maflcko changed the title [22.x] ci: Backport CentOS 8 [22.x] build: Bump depends packages (zmq, libXau) Feb 9, 2022
@maflcko
Copy link
Member

maflcko commented Feb 9, 2022

Changed title

@fanquake
Copy link
Member Author

fanquake commented Feb 9, 2022

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: zeromq/libzmq@9a39766. Also rebased for #24215.

@maflcko
Copy link
Member

maflcko commented Feb 9, 2022

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

@hebasto
Copy link
Member

hebasto commented Feb 9, 2022

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

Concept ACK on supporting dash in CentOS.

@fanquake fanquake force-pushed the backport_centos_8 branch 2 times, most recently from 611a1d6 to 37e8ea5 Compare February 14, 2022 11:08
fanquake and others added 3 commits February 14, 2022 16:54
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).
Github-Pull: bitcoin#24212
Rebased-From: fa5457e
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK d34691c

@fanquake fanquake merged commit eff9709 into bitcoin:22.x Feb 15, 2022
@fanquake fanquake deleted the backport_centos_8 branch November 9, 2022 16:47
@bitcoin bitcoin locked and limited conversation to collaborators Nov 9, 2023
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.

3 participants