Skip to content

Commit

Permalink
Merge bitcoin#30588: depends: fix ZMQ CMake getcachesize check
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake committed Aug 6, 2024
2 parents d928f4c + a0a9a11 commit 43740f4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
2 changes: 2 additions & 0 deletions depends/packages/zeromq.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $(package)_patches += builtin_sha1.patch
$(package)_patches += fix_have_windows.patch
$(package)_patches += openbsd_kqueue_headers.patch
$(package)_patches += cmake_minimum.patch
$(package)_patches += cacheline_undefined.patch
$(package)_patches += no_librt.patch

define $(package)_set_vars
Expand All @@ -25,6 +26,7 @@ define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \
patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch && \
patch -p1 < $($(package)_patch_dir)/builtin_sha1.patch && \
patch -p1 < $($(package)_patch_dir)/cacheline_undefined.patch && \
patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \
patch -p1 < $($(package)_patch_dir)/openbsd_kqueue_headers.patch && \
patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch && \
Expand Down
15 changes: 15 additions & 0 deletions depends/patches/zeromq/cacheline_undefined.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Use proper STREQUAL instead of EQUAL to compare strings.txt

See: https://github.com/zeromq/libzmq/pull/4711.

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -476,7 +476,7 @@ execute_process(
if(CACHELINE_SIZE STREQUAL ""
OR CACHELINE_SIZE EQUAL 0
OR CACHELINE_SIZE EQUAL -1
- OR CACHELINE_SIZE EQUAL "undefined")
+ OR CACHELINE_SIZE STREQUAL "undefined")
set(ZMQ_CACHELINE_SIZE 64)
else()
set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})

0 comments on commit 43740f4

Please sign in to comment.