File tree Expand file tree Collapse file tree 2 files changed +17
-0
lines changed Expand file tree Collapse file tree 2 files changed +17
-0
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ $(package)_patches += builtin_sha1.patch
10
10
$(package)_patches += fix_have_windows.patch
11
11
$(package)_patches += openbsd_kqueue_headers.patch
12
12
$(package)_patches += cmake_minimum.patch
13
+ $(package)_patches += cacheline_undefined.patch
13
14
$(package)_patches += no_librt.patch
14
15
15
16
define $(package)_set_vars
@@ -25,6 +26,7 @@ define $(package)_preprocess_cmds
25
26
patch -p1 < $($(package ) _patch_dir) /remove_libstd_link.patch && \
26
27
patch -p1 < $($(package ) _patch_dir) /macos_mktemp_check.patch && \
27
28
patch -p1 < $($(package ) _patch_dir) /builtin_sha1.patch && \
29
+ patch -p1 < $($(package ) _patch_dir) /cacheline_undefined.patch && \
28
30
patch -p1 < $($(package ) _patch_dir) /fix_have_windows.patch && \
29
31
patch -p1 < $($(package ) _patch_dir) /openbsd_kqueue_headers.patch && \
30
32
patch -p1 < $($(package ) _patch_dir) /cmake_minimum.patch && \
Original file line number Diff line number Diff line change
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})
You can’t perform that action at this time.
0 commit comments