From b05f2720a781893c4b9f84dc5101f1f5bb102a94 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:10:38 +0000 Subject: [PATCH] depends: Fix Autotools-generated `libzmq.pc` file See https://github.com/zeromq/libzmq/pull/4667. Co-authored-by: Cory Fields --- depends/packages/zeromq.mk | 4 +++- depends/patches/zeromq/fix_mingw_link.patch | 24 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 depends/patches/zeromq/fix_mingw_link.patch diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 23bd58bf531c25..b2a1cfd056dc4c 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 += cmake_minimum.patch $(package)_patches += no_librt.patch +$(package)_patches += fix_mingw_link.patch define $(package)_set_vars $(package)_config_opts := -DCMAKE_BUILD_TYPE=None -DWITH_DOCS=OFF -DWITH_LIBSODIUM=OFF @@ -26,7 +27,8 @@ define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/builtin_sha1.patch && \ patch -p1 < $($(package)_patch_dir)/fix_have_windows.patch && \ patch -p1 < $($(package)_patch_dir)/cmake_minimum.patch && \ - patch -p1 < $($(package)_patch_dir)/no_librt.patch + patch -p1 < $($(package)_patch_dir)/no_librt.patch && \ + patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch endef define $(package)_config_cmds diff --git a/depends/patches/zeromq/fix_mingw_link.patch b/depends/patches/zeromq/fix_mingw_link.patch new file mode 100644 index 00000000000000..c1ee5c7c956f45 --- /dev/null +++ b/depends/patches/zeromq/fix_mingw_link.patch @@ -0,0 +1,24 @@ +commit 5bd0b91a64b4acacb210d91ee297e775fdc58737 +Author: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> +Date: Wed Mar 20 14:37:26 2024 +0000 + + Fix Autotools-generated `libzmq.pc` file + + This change fixes cross-compiling for Windows with static linking. + + See https://github.com/zeromq/libzmq/pull/4667. + + +diff --git a/configure.ac b/configure.ac +index 622f544d..bfea9499 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -365,7 +365,7 @@ case "${host_os}" in + + if test "x$enable_static" = "xyes"; then + CPPFLAGS="-DZMQ_STATIC $CPPFLAGS" +- PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi" ++ PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi -lws2_32" + fi + # Set FD_SETSIZE to 16384 + CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"