diff options
| author | fanquake <fanquake@gmail.com> | 2024-08-05 13:44:11 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-08-05 14:17:58 +0100 |
| commit | a0a9a11642752578fb1f5142c3fb26cb39d1548a (patch) | |
| tree | 054554a7ffa154fa1f0b3f12d50b87628727cfa0 /depends | |
| parent | 1afa3c84fcdcad3b54ec13f29d7957ec1c2b01d0 (diff) | |
depends: fix ZMQ CMake getcachesize check
Fixes #30587.
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/zeromq.mk | 2 | ||||
| -rw-r--r-- | depends/patches/zeromq/cacheline_undefined.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 7620df5477..df018a1032 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -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 @@ -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 && \ diff --git a/depends/patches/zeromq/cacheline_undefined.patch b/depends/patches/zeromq/cacheline_undefined.patch new file mode 100644 index 0000000000..02bd2a5fe5 --- /dev/null +++ b/depends/patches/zeromq/cacheline_undefined.patch @@ -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}) |