Skip to content

Commit 5aed697

Browse files
committed
depends: Fix Autotools-generated libzmq.pc file
See zeromq/libzmq#4667.
1 parent f9b43f7 commit 5aed697

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

depends/packages/zeromq.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
66
$(package)_patches=remove_libstd_link.patch
7+
$(package)_patches+=fix_mingw_link.patch
78

89
define $(package)_set_vars
910
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind
@@ -14,6 +15,7 @@ define $(package)_set_vars
1415
endef
1516

1617
define $(package)_preprocess_cmds
18+
patch -p1 < $($(package)_patch_dir)/fix_mingw_link.patch && \
1719
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch
1820
endef
1921

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
commit 5bd0b91a64b4acacb210d91ee297e775fdc58737
2+
Author: Hennadii Stepanov <[email protected]>
3+
Date: Wed Mar 20 14:37:26 2024 +0000
4+
5+
Fix Autotools-generated `libzmq.pc` file
6+
7+
This change fixes cross-compiling for Windows with static linking.
8+
9+
See https://github.com/zeromq/libzmq/pull/4667.
10+
11+
12+
diff --git a/configure.ac b/configure.ac
13+
index 622f544d..bfea9499 100644
14+
--- a/configure.ac
15+
+++ b/configure.ac
16+
@@ -365,7 +365,7 @@ case "${host_os}" in
17+
18+
if test "x$enable_static" = "xyes"; then
19+
CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
20+
- PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi"
21+
+ PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi -lws2_32"
22+
fi
23+
# Set FD_SETSIZE to 16384
24+
CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"

0 commit comments

Comments
 (0)