Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Aug 5, 2024

Fixes #30587.

@DrahtBot
Copy link
Contributor

DrahtBot commented Aug 5, 2024

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.

@fanquake fanquake force-pushed the zmq_s390x_missing_fixes branch from bb50ae6 to a0a9a11 Compare August 5, 2024 13:18
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 a0a9a11. On Ubuntu (s390x), I was able to reproduce #30587. With this PR building zeromq succeeds.

@maflcko
Copy link
Member

maflcko commented Aug 5, 2024

ACK a0a9a11

# 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

Copy link
Contributor

@TheCharlatan TheCharlatan left a comment

Choose a reason for hiding this comment

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

ACK a0a9a11

@DrahtBot
Copy link
Contributor

DrahtBot commented Aug 5, 2024

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

File commit 42326b0
(master)
commit 9d1028b
(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...

@fanquake fanquake merged commit 43740f4 into bitcoin:master Aug 6, 2024
16 checks passed
@fanquake fanquake deleted the zmq_s390x_missing_fixes branch August 6, 2024 09:30
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Oct 25, 2024
a0a9a11 depends: fix ZMQ CMake getcachesize check (fanquake)

Pull request description:

  Fixes bitcoin#30587.

ACKs for top commit:
  maflcko:
    ACK a0a9a11
  hebasto:
    ACK a0a9a11. On Ubuntu (s390x), I was able to reproduce bitcoin#30587. With this PR building `zeromq` succeeds.
  TheCharlatan:
    ACK a0a9a11

Tree-SHA512: 70ca50ebe8e36d5a10a2354a1fbed49f5f802ae5115e09686bccca7e5d1da35168e84a6cab40dd2c83f8918889cdfdcbd5d1cbe25273b844c8ddd21865ea6c51
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Oct 27, 2024
a0a9a11 depends: fix ZMQ CMake getcachesize check (fanquake)

Pull request description:

  Fixes bitcoin#30587.

ACKs for top commit:
  maflcko:
    ACK a0a9a11
  hebasto:
    ACK a0a9a11. On Ubuntu (s390x), I was able to reproduce bitcoin#30587. With this PR building `zeromq` succeeds.
  TheCharlatan:
    ACK a0a9a11

Tree-SHA512: 70ca50ebe8e36d5a10a2354a1fbed49f5f802ae5115e09686bccca7e5d1da35168e84a6cab40dd2c83f8918889cdfdcbd5d1cbe25273b844c8ddd21865ea6c51
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Oct 27, 2024
b654479 Merge bitcoin#30705: test: Avoid intermittent block download timeout in p2p_ibd_stalling (merge-script)
745a819 Merge bitcoin#30690: devtools, utxo-snapshot: Fix block height out of range in script (Ava Chow)
01b570e Merge bitcoin#29999: guix: fix suggested fake date for openssl-1.1.1l (Ava Chow)
432f352 Merge bitcoin#30580: doc: Add note about distro's `g++-mingw-w64-x86-64-posix` version (merge-script)
1bd090e Merge bitcoin#30597: doc: Drop no longer needed workaround for WSL (merge-script)
8a12237 Merge bitcoin#30630: doc: Update ccache website link (merge-script)
f66547f Merge bitcoin#30588: depends: fix ZMQ CMake getcachesize check (merge-script)
ddaec96 Merge bitcoin#30565: depends: Fix `zeromq` build on OpenBSD (merge-script)
e4e5605 Merge bitcoin#30552: test: fix constructor of msg_tx (merge-script)
df3c239 Merge bitcoin#26950: cleanse: switch to SecureZeroMemory for Windows cross-compile (merge-script)
57945ce Merge bitcoin#30506: depends: Cleanup postprocess commands after switching to CMake (merge-script)
e016ffa Merge bitcoin#29878: depends: build expat with CMake (merge-script)
62dcd43 Merge bitcoin#29880: depends: build FreeType with CMake (merge-script)
745addf Merge bitcoin#30245: net: Allow -proxy=[::1] on nodes with IPV6 lo only (Ava Chow)
4e144be Merge bitcoin-core/gui#795: Keep focus on "Hide" while ModalOverlay is visible (Hennadii Stepanov)
69c04b2 Merge bitcoin#30372: util: Use SteadyClock in RandAddSeedPerfmon (merge-script)
ebed8af Merge bitcoin#30336: depends: update doc in Qt pwd patch (merge-script)
9793fb1 Merge bitcoin#30340: test: Added coverage to Block not found error using gettxoutsetinfo (Ava Chow)
479cb8b Merge bitcoin#30312: contrib: add R(UN)PATH check to ELF symbol-check (merge-script)
ca83773 Merge bitcoin#30283: upnp: fix build with miniupnpc 2.2.8 (merge-script)
63e139d Merge bitcoin#30185: guix: show `*_FLAGS` variables in pre-build output (merge-script)
3be0d3e Merge bitcoin#30097: crypto: disable asan for sha256_sse4 with clang and -O0 (merge-script)
3070c3e Merge bitcoin#30078: depends: set AR & RANLIB for CMake (merge-script)

Pull request description:

  ## Issue being fixed or feature implemented
  Trivial backports

  ## What was done?

  ## How Has This Been Tested?
  built locally

  ## Breaking Changes

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  UdjinM6:
    utACK b654479
  kwvg:
    utACK b654479

Tree-SHA512: 10b5af4e92c83fa9d6764b20bf066bba8e4c600402966fd5c1d6dad07b0549d8a42151a33f21e2f8263336c12a810a6f3fc2828d90bc98153e09c165d9e5b043
@bitcoin bitcoin locked and limited conversation to collaborators Aug 6, 2025
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.

build: Native ./depends build fails on s390x
5 participants