Skip to content

Commit 0388ad0

Browse files
theunifanquake
andcommitted
depends: switch zmq to CMake
The CMake WIN32_WINNT autodetection is broken, and must be set manually. We may want to set is explicitly in any case, but the brokenness should also be fixed upstream. Also patch out depends paths, that would cause non-determinism. Co-authored-by: fanquake <[email protected]>
1 parent fefb3bb commit 0388ad0

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

depends/packages/zeromq.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $(package)_version=4.3.5
33
$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
6+
$(package)_build_subdir=build
67
$(package)_patches = remove_libstd_link.patch
78
$(package)_patches += macos_mktemp_check.patch
89
$(package)_patches += builtin_sha1.patch
@@ -11,11 +12,12 @@ $(package)_patches += cmake_minimum.patch
1112
$(package)_patches += no_librt.patch
1213

1314
define $(package)_set_vars
14-
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind
15-
$(package)_config_opts += --disable-perf --disable-curve-keygen --disable-curve --disable-libbsd
16-
$(package)_config_opts += --without-libsodium --without-libgssapi_krb5 --without-pgm --without-norm --without-vmci
17-
$(package)_config_opts += --disable-libunwind --disable-radix-tree --without-gcov --disable-dependency-tracking
18-
$(package)_config_opts += --disable-Werror --disable-drafts --enable-option-checking
15+
$(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DWITH_DOCS=OFF -DWITH_LIBSODIUM=OFF
16+
$(package)_config_opts += -DWITH_LIBBSD=OFF -DENABLE_CURVE=OFF -DENABLE_CPACK=OFF
17+
$(package)_config_opts += -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DZMQ_BUILD_TESTS=OFF
18+
$(package)_config_opts += -DENABLE_DRAFTS=OFF -DZMQ_BUILD_TESTS=OFF
19+
$(package)_cxxflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
20+
$(package)_config_opts_mingw32 += -DZMQ_WIN32_WINNT=0x0601 -DZMQ_HAVE_IPC=OFF
1921
endef
2022

2123
define $(package)_preprocess_cmds
@@ -28,17 +30,15 @@ define $(package)_preprocess_cmds
2830
endef
2931

3032
define $(package)_config_cmds
31-
./autogen.sh && \
32-
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config && \
33-
$($(package)_autoconf)
33+
$($(package)_cmake) -S .. -B .
3434
endef
3535

3636
define $(package)_build_cmds
37-
$(MAKE) src/libzmq.la
37+
$(MAKE)
3838
endef
3939

4040
define $(package)_stage_cmds
41-
$(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS install-pkgconfigDATA
41+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
4242
endef
4343

4444
define $(package)_postprocess_cmds

0 commit comments

Comments
 (0)