aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2024-07-15 16:38:15 +0100
committerfanquake <fanquake@gmail.com>2024-07-19 10:00:24 +0100
commita522ef15424110f76172b3c0603fa08f7291c9fc (patch)
tree424ecaba16287f0f7f7b2e4cf00f6f5b737c9953 /depends
parentcbbc229adf4c12ad4bd7edde71425b8ef217edfc (diff)
depends: add zeromq cmake minimum patch
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/zeromq.mk4
-rw-r--r--depends/patches/zeromq/cmake_minimum.patch18
2 files changed, 21 insertions, 1 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
index 0f8ede8699..ef2ff0b6d7 100644
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@@ -7,6 +7,7 @@ $(package)_patches = remove_libstd_link.patch
$(package)_patches += macos_mktemp_check.patch
$(package)_patches += builtin_sha1.patch
$(package)_patches += fix_have_windows.patch
+$(package)_patches += cmake_minimum.patch
define $(package)_set_vars
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind
@@ -20,7 +21,8 @@ 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)/fix_have_windows.patch
+ patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \
+ patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch
endef
define $(package)_config_cmds
diff --git a/depends/patches/zeromq/cmake_minimum.patch b/depends/patches/zeromq/cmake_minimum.patch
new file mode 100644
index 0000000000..d6b6b5fae7
--- /dev/null
+++ b/depends/patches/zeromq/cmake_minimum.patch
@@ -0,0 +1,18 @@
+Set a more sane cmake_minimum_required.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,12 +1,7 @@
+ # CMake build script for ZeroMQ
++cmake_minimum_required(VERSION 3.16)
+ project(ZeroMQ)
+
+-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
+- cmake_minimum_required(VERSION 3.0.2)
+-else()
+- cmake_minimum_required(VERSION 2.8.12)
+-endif()
+-
+ include(CheckIncludeFiles)
+ include(CheckCCompilerFlag)
+ include(CheckCXXCompilerFlag)