Skip to content

Commit 43740f4

Browse files
committed
Merge bitcoin#30588: depends: fix ZMQ CMake getcachesize check
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
2 parents d928f4c + a0a9a11 commit 43740f4

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

depends/packages/zeromq.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $(package)_patches += builtin_sha1.patch
1010
$(package)_patches += fix_have_windows.patch
1111
$(package)_patches += openbsd_kqueue_headers.patch
1212
$(package)_patches += cmake_minimum.patch
13+
$(package)_patches += cacheline_undefined.patch
1314
$(package)_patches += no_librt.patch
1415

1516
define $(package)_set_vars
@@ -25,6 +26,7 @@ define $(package)_preprocess_cmds
2526
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \
2627
patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch && \
2728
patch -p1 < $($(package)_patch_dir)/builtin_sha1.patch && \
29+
patch -p1 < $($(package)_patch_dir)/cacheline_undefined.patch && \
2830
patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \
2931
patch -p1 < $($(package)_patch_dir)/openbsd_kqueue_headers.patch && \
3032
patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch && \
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Use proper STREQUAL instead of EQUAL to compare strings.txt
2+
3+
See: https://github.com/zeromq/libzmq/pull/4711.
4+
5+
--- a/CMakeLists.txt
6+
+++ b/CMakeLists.txt
7+
@@ -476,7 +476,7 @@ execute_process(
8+
if(CACHELINE_SIZE STREQUAL ""
9+
OR CACHELINE_SIZE EQUAL 0
10+
OR CACHELINE_SIZE EQUAL -1
11+
- OR CACHELINE_SIZE EQUAL "undefined")
12+
+ OR CACHELINE_SIZE STREQUAL "undefined")
13+
set(ZMQ_CACHELINE_SIZE 64)
14+
else()
15+
set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})

0 commit comments

Comments
 (0)