Skip to content

Commit 7320c3d

Browse files
nmarleyUdjinM6
authored andcommitted
Refresh zmq 4.1.5 patches (#3092)
Some implementations of the `patch` tool cannot handle fuzz / divergence
1 parent 822e617 commit 7320c3d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

depends/patches/zeromq/9114d3957725acd34aa8b8d011585812f3369411.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Subject: [PATCH] enable static libraries on mingw
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/configure.ac b/configure.ac
11-
index 393505b..e92131a 100644
11+
index d702461..da24aa5 100644
1212
--- a/configure.ac
1313
+++ b/configure.ac
14-
@@ -265,7 +265,7 @@ case "${host_os}" in
14+
@@ -261,7 +261,7 @@ case "${host_os}" in
1515
libzmq_dso_visibility="no"
16-
16+
1717
if test "x$enable_static" = "xyes"; then
1818
- AC_MSG_ERROR([Building static libraries is not supported under MinGW32])
1919
+ CPPFLAGS="-DZMQ_STATIC"
2020
fi
21-
22-
# Set FD_SETSIZE to 1024
21+
;;
22+
*cygwin*)

depends/patches/zeromq/9e6745c12e0b100cd38acecc16ce7db02905e27c.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Subject: [PATCH] Fix autotools for static MinGW builds
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/configure.ac b/configure.ac
11-
index 5a0fa14..def6ea7 100644
11+
index da24aa5..abfd88b 100644
1212
--- a/configure.ac
1313
+++ b/configure.ac
14-
@@ -259,7 +259,7 @@ case "${host_os}" in
14+
@@ -261,7 +261,7 @@ case "${host_os}" in
1515
libzmq_dso_visibility="no"
16-
16+
1717
if test "x$enable_static" = "xyes"; then
1818
- CPPFLAGS="-DZMQ_STATIC"
1919
+ CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
2020
fi
21-
22-
# Set FD_SETSIZE to 1024
21+
;;
22+
*cygwin*)

0 commit comments

Comments
 (0)