From 3c0f5c90a58c4c32fa016b56f35cfb6d9c3afc22 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. --- depends/packages/zeromq.mk | 2 ++ depends/patches/zeromq/fix_mingw_link.patch | 24 +++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 depends/patches/zeromq/fix_mingw_link.patch diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index cc78999dbbeb9..de6ec942af69a 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -4,6 +4,7 @@ $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 $(package)_patches=remove_libstd_link.patch +$(package)_patches+=fix_mingw_link.patch define $(package)_set_vars $(package)_config_opts = --without-docs --disable-shared --disable-valgrind @@ -19,6 +20,7 @@ define $(package)_set_vars endef define $(package)_preprocess_cmds + patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch && \ patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch endef diff --git a/depends/patches/zeromq/fix_mingw_link.patch b/depends/patches/zeromq/fix_mingw_link.patch new file mode 100644 index 0000000000000..9bb12028ada01 --- /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"