Mercurial > mxe-octave
changeset 5638:3c303f9b5a36
zeromq: update to v4.3.3
* src/zeromq.mk: update version/checksum
* src/mingw-zeromq-1-fixes.patch: new file
* dist-files: add ref to patch file
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sun, 17 Jan 2021 08:00:16 -0500 |
| parents | 046929464015 |
| children | ae36e8c35157 |
| files | dist-files.mk src/mingw-zeromq-1-fixes.patch src/zeromq.mk |
| diffstat | 3 files changed, 70 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Wed Jan 13 11:02:25 2021 -0500 +++ b/dist-files.mk Sun Jan 17 08:00:16 2021 -0500 @@ -353,6 +353,7 @@ mingw-utils-1-portability-fix.patch \ mingw-w64-1-float-h.patch \ mingw-w64.mk \ + mingw-zeromq-1-fixes.patch \ mingwrt.mk \ mman-win32-1-include_name_change.patch \ mman-win32.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-zeromq-1-fixes.patch Sun Jan 17 08:00:16 2021 -0500 @@ -0,0 +1,64 @@ +--- a/tests/testutil.cpp ++++ b/tests/testutil.cpp +@@ -382,7 +382,7 @@ fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_) + protocol_ == IPPROTO_UDP + ? IPPROTO_UDP + : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); +- TEST_ASSERT_NOT_EQUAL (-1, s_pre); ++ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); + + if (af_ == AF_INET || af_ == AF_INET6) { + const char *port = strrchr (endpoint_, ':') + 1; +@@ -439,7 +439,7 @@ fd_t bind_socket_resolve_port (const char *address_, + protocol_ == IPPROTO_UDP + ? IPPROTO_UDP + : protocol_ == IPPROTO_TCP ? IPPROTO_TCP : 0); +- TEST_ASSERT_NOT_EQUAL (-1, s_pre); ++ TEST_ASSERT_NOT_EQUAL (retired_fd, s_pre); + + if (af_ == AF_INET || af_ == AF_INET6) { + #ifdef ZMQ_HAVE_WINDOWS + +--- a/tests/testutil.hpp ++++ b/tests/testutil.hpp +@@ -102,7 +102,6 @@ const uint8_t zmtp_ready_sub[27] = { + #include <winsock2.h> + #include <ws2tcpip.h> + #include <stdexcept> +-#define close closesocket + typedef int socket_size_t; + inline const char *as_setsockopt_opt_t (const void *opt) + { + +--- a/tests/testutil.cpp ++++ b/tests/testutil.cpp +@@ -296,7 +296,7 @@ int is_ipv6_available () + ipv6 = 0; + } + #endif +- close (fd); ++ closesocket (fd); + } + + return ipv6; +@@ -484,7 +484,7 @@ fd_t bind_socket_resolve_port (const char *address_, + #else + int fd = mkstemp (buffer); + TEST_ASSERT_TRUE (fd != -1); +- close (fd); ++ closesocket (fd); + #endif + #endif + strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer); +diff -ur zeromq-4.3.3.orig/Makefile.in zeromq-4.3.3/Makefile.in +--- zeromq-4.3.3.orig/Makefile.in 2021-01-16 16:58:57.118548621 -0500 ++++ zeromq-4.3.3/Makefile.in 2021-01-16 17:07:39.885588121 -0500 +@@ -2881,7 +2881,7 @@ + $(am__append_29) $(am__append_30) $(am__append_31) \ + $(am__append_32) $(am__append_33) $(am__append_36) \ + $(am__append_37) $(am__append_38) $(am__append_39) +-UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT ++UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT -D__USE_MINGW_ANSI_STDIO=1 + UNITY_LIBS = $(top_builddir)/external/unity/libunity.a + external_unity_libunity_a_SOURCES = external/unity/unity.c \ + external/unity/unity.h \
--- a/src/zeromq.mk Wed Jan 13 11:02:25 2021 -0500 +++ b/src/zeromq.mk Sun Jan 17 08:00:16 2021 -0500 @@ -3,8 +3,8 @@ PKG := zeromq $(PKG)_IGNORE := -$(PKG)_VERSION := 4.3.1 -$(PKG)_CHECKSUM := 6cce22d830eaf95feff7cab00744df13ad7ab7f3 +$(PKG)_VERSION := 4.3.3 +$(PKG)_CHECKSUM := d78bc504194d6908df40a2b9e41849b181b02491 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://github.com/$(PKG)/libzmq/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -20,8 +20,10 @@ cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ + --disable-perf \ --without-libsodium \ $(ENABLE_SHARED_OR_STATIC) + $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' endef