diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index 4b884ba9a8..ce614cfe28 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zeromq -PKG_VERSION:=4.3.3 -PKG_RELEASE:=2 +PKG_VERSION:=4.3.4 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/zeromq/libzmq/releases/download/v$(PKG_VERSION) -PKG_HASH:=9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2 +PKG_HASH:=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5 PKG_MAINTAINER:=Dirk Chang PKG_LICENSE:=GPL-3.0-or-later diff --git a/libs/zmq/patches/010-uclibcxx.patch b/libs/zmq/patches/010-uclibcxx.patch deleted file mode 100644 index 1c923c75a5..0000000000 --- a/libs/zmq/patches/010-uclibcxx.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- a/perf/benchmark_radix_tree.cpp -+++ b/perf/benchmark_radix_tree.cpp -@@ -26,8 +26,8 @@ - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - */ -- --#if __cplusplus >= 201103L -+#include -+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) - - #include "radix_tree.hpp" - #include "trie.hpp" ---- a/src/atomic_counter.hpp -+++ b/src/atomic_counter.hpp -@@ -35,7 +35,7 @@ - - #if defined ZMQ_FORCE_MUTEXES - #define ZMQ_ATOMIC_COUNTER_MUTEX --#elif (defined __cplusplus && __cplusplus >= 201103L) \ -+#elif (defined __cplusplus && __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)) \ - || (defined _MSC_VER && _MSC_VER >= 1900) - #define ZMQ_ATOMIC_COUNTER_CXX11 - #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS ---- a/src/atomic_ptr.hpp -+++ b/src/atomic_ptr.hpp -@@ -34,7 +34,7 @@ - - #if defined ZMQ_FORCE_MUTEXES - #define ZMQ_ATOMIC_PTR_MUTEX --#elif (defined __cplusplus && __cplusplus >= 201103L) \ -+#elif (defined __cplusplus && __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)) \ - || (defined _MSC_VER && _MSC_VER >= 1900) - #define ZMQ_ATOMIC_PTR_CXX11 - #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS ---- a/src/blob.hpp -+++ b/src/blob.hpp -@@ -38,7 +38,7 @@ - #include - #include - --#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700 -+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) || defined(_MSC_VER) && _MSC_VER > 1700 - #define ZMQ_HAS_MOVE_SEMANTICS - #define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v) - #define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back ---- a/src/msg.hpp -+++ b/src/msg.hpp -@@ -30,8 +30,8 @@ - #ifndef __ZMQ_MSG_HPP_INCLUDE__ - #define __ZMQ_MSG_HPP_INCLUDE__ - --#include --#include -+#include -+#include - - #include "config.hpp" - #include "err.hpp" ---- a/src/options.hpp -+++ b/src/options.hpp -@@ -305,7 +305,7 @@ int do_getsockopt (void *const optval_, - template - int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_) - { --#if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ > 5) -+#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) && (!defined(__GNUC__) || __GNUC__ > 5) - static_assert (std::is_trivially_copyable::value, - "invalid use of do_getsockopt"); - #endif ---- a/src/ctx.cpp -+++ b/src/ctx.cpp -@@ -725,7 +725,7 @@ void zmq::ctx_t::unregister_endpoints (c - end = _endpoints.end (); - it != end;) { - if (it->second.socket == socket_) --#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700) -+#if (__cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)) && !defined(__UCLIBCXX_MAJOR__) - it = _endpoints.erase (it); - #else - _endpoints.erase (it++); ---- a/src/radio.cpp -+++ b/src/radio.cpp -@@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pip - end = _subscriptions.end (); - it != end;) { - if (it->second == pipe_) { --#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700) -+#if (__cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)) && !defined(__UCLIBCXX_MAJOR__) - it = _subscriptions.erase (it); - #else - _subscriptions.erase (it++);