diff options
| author | fanquake <fanquake@gmail.com> | 2024-07-15 16:32:27 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-07-19 10:00:24 +0100 |
| commit | 0c8605253ae887dac316264cb969b752027d277a (patch) | |
| tree | 9de6460dbcddca0e0572e8e0e74514321a789170 /depends | |
| parent | ed739d14b58b5e772a65b85bb421703963b06852 (diff) | |
depends: add zeromq mktemp macos patch
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/zeromq.mk | 6 | ||||
| -rw-r--r-- | depends/patches/zeromq/macos_mktemp_check.patch | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index bfa5e97c60..d3bd3da6c7 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -3,7 +3,8 @@ $(package)_version=4.3.5 $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 -$(package)_patches=remove_libstd_link.patch +$(package)_patches = remove_libstd_link.patch +$(package)_patches += macos_mktemp_check.patch define $(package)_set_vars $(package)_config_opts = --without-docs --disable-shared --disable-valgrind @@ -14,7 +15,8 @@ define $(package)_set_vars endef define $(package)_preprocess_cmds - patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch + patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \ + patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch endef define $(package)_config_cmds diff --git a/depends/patches/zeromq/macos_mktemp_check.patch b/depends/patches/zeromq/macos_mktemp_check.patch new file mode 100644 index 0000000000..c703abcd71 --- /dev/null +++ b/depends/patches/zeromq/macos_mktemp_check.patch @@ -0,0 +1,16 @@ +build: fix mkdtemp check on macOS + +On macOS, mkdtemp is in unistd.h. Fix the CMake check so that is works. +Upstreamed in https://github.com/zeromq/libzmq/pull/4668. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -599,7 +599,7 @@ if(NOT MSVC) + + check_cxx_symbol_exists(fork unistd.h HAVE_FORK) + check_cxx_symbol_exists(gethrtime sys/time.h HAVE_GETHRTIME) +- check_cxx_symbol_exists(mkdtemp stdlib.h HAVE_MKDTEMP) ++ check_cxx_symbol_exists(mkdtemp "stdlib.h;unistd.h" HAVE_MKDTEMP) + check_cxx_symbol_exists(accept4 sys/socket.h HAVE_ACCEPT4) + check_cxx_symbol_exists(strnlen string.h HAVE_STRNLEN) + else() |