depends: fix ZMQ CMake getcachesize check #30588

pull fanquake wants to merge 1 commits into bitcoin:master from fanquake:zmq_s390x_missing_fixes changing 2 files +17 −0

fanquake commented at 12:47 PM on August 5, 2024: member

Fixes #30587.
DrahtBot commented at 12:47 PM on August 5, 2024: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage

For detailed information about the code coverage, see the test coverage report.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK hebasto, maflcko, TheCharlatan

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
DrahtBot added the label Build system on Aug 5, 2024
fanquake removed the label Build system on Aug 5, 2024
fanquake added the label DrahtBot Guix build requested on Aug 5, 2024
depends: fix ZMQ CMake getcachesize check
Fixes #30587.
a0a9a11642
in depends/patches/zeromq/cacheline_undefined.patch:1 in bb50ae69ae outdated
```
   0 | @@ -0,0 +1,17 @@
   1 | +commit 8c3da001bd406673938081511f7496a8ddeeea0b
```
hebasto commented at 1:15 PM on August 5, 2024:

Where does this commit hash come from?

I can see https://github.com/zeromq/libzmq/commit/55bd6b3df06734730d3012c17bc26681e25b549d or https://github.com/zeromq/libzmq/commit/59c91227b46b60b7f965816544b25fe0a3cc8bbe.

fanquake commented at 1:16 PM on August 5, 2024:

From my cherry pick
fanquake force-pushed on Aug 5, 2024
hebasto approved
hebasto commented at 1:33 PM on August 5, 2024: member

ACK a0a9a11642752578fb1f5142c3fb26cb39d1548a. On Ubuntu (s390x), I was able to reproduce #30587. With this PR building zeromq succeeds.

Type	Reviewers
ACK	hebasto, maflcko, TheCharlatan

maflcko commented at 2:08 PM on August 5, 2024: member

ACK a0a9a11642752578fb1f5142c3fb26cb39d1548a

# make NO_QT=1 NO_WALLET=1 NO_UPNP=1 NO_NATPMP=1 && git log -1 --oneline 
copying packages: boost libevent systemtap zeromq
to: /b-c/depends/s390x-ibm-linux-gnu
a0a9a11642 (HEAD) depends: fix ZMQ CMake getcachesize check

TheCharlatan approved
TheCharlatan commented at 8:48 PM on August 5, 2024: contributor

ACK a0a9a11642752578fb1f5142c3fb26cb39d1548a

DrahtBot commented at 8:59 PM on August 5, 2024: contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File	commit 42326b0fa46a67ad278cef7709a29feb05ce0110<br>(master)	commit 9d1028b9aacdf15e4ff8409721506261e04fd75d<br>(master and this pull)
SHA256SUMS.part	`efa2028d2cb6c1c9...`	`4185d74cc1877fb1...`
*-aarch64-linux-gnu-debug.tar.gz	`57dfecd4fabeb8f0...`	`ad2d0eb5a9df8825...`
*-aarch64-linux-gnu.tar.gz	`2818ad2a0651730a...`	`6abc0ee64dfb9ebf...`
*-arm-linux-gnueabihf-debug.tar.gz	`100b53542c8ba517...`	`d20824fb565116cb...`
*-arm-linux-gnueabihf.tar.gz	`95f8530a819696a3...`	`dca5510202b0a89a...`
*-arm64-apple-darwin-unsigned.tar.gz	`5099623623bb81d2...`	`fd1cb70b2fcef09d...`
*-arm64-apple-darwin-unsigned.zip	`fc4b001a7fc452b2...`	`58ec3e44bf92cea0...`
*-arm64-apple-darwin.tar.gz	`4dd53fa178ee0089...`	`e598cc10c59deee5...`
*-powerpc64-linux-gnu-debug.tar.gz	`c3190fbc030eb5d1...`	`eb9afe090e3afb94...`
*-powerpc64-linux-gnu.tar.gz	`5f667f24084d7c58...`	`d8f7ad32d772b4e3...`
*-riscv64-linux-gnu-debug.tar.gz	`40151fcef94f007f...`	`698ec2b02cf02abe...`
*-riscv64-linux-gnu.tar.gz	`843a511cd2618ac5...`	`6ce983e3bcacd587...`
*-x86_64-apple-darwin-unsigned.tar.gz	`14469a6834d40cb4...`	`f41ac5af6f5cccad...`
*-x86_64-apple-darwin-unsigned.zip	`59e88232455c42df...`	`eb5c87beb9e89fa0...`
*-x86_64-apple-darwin.tar.gz	`b119eab8ae4297d4...`	`5755c2209a9d56e8...`
*-x86_64-linux-gnu-debug.tar.gz	`4b230fd31ead3d8b...`	`2b87c92e928d2ef2...`
*-x86_64-linux-gnu.tar.gz	`11493367fc75396c...`	`0e24c4d62dff2e0b...`
*.tar.gz	`d6fb389c3b2d920d...`	`0cbee8e2e1f20cd2...`
guix_build.log	`9ce6566bfc310c73...`	`5fc654fa0e423746...`
guix_build.log.diff		`88691087fe955374...`