From 299344694e8a25473e58df2c5eb83c4625562578 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 11 Jun 2018 21:42:16 -0700 Subject: [PATCH] zmq: Update to 4.1.6 Signed-off-by: Rosen Penev --- libs/zmq/Makefile | 8 ++++---- .../010-disable_pedantic_on_linux_with_ulibc++.patch | 2 +- .../patches/020-map_with_const_string_with_ublic++.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index a82a70eec..290eef50d 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -10,15 +10,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zeromq -PKG_VERSION:=4.1.4 +PKG_VERSION:=4.1.6 PKG_RELEASE:=1 PKG_MAINTAINER:=Dirk Chang PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=LICENCE.txt PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:= https://github.com/zeromq/zeromq4-1/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378 +PKG_SOURCE_URL:=https://github.com/zeromq/zeromq4-1/releases/download/v$(PKG_VERSION) +PKG_HASH:=02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -48,7 +48,7 @@ define Package/libzmq-curve $(call Package/libzmq/default) VARIANT:=curve TITLE+= (CurveZMQ) - DEPENDS+=+libsodium + DEPENDS+=+libsodium endef define Package/libzmq-nc/description diff --git a/libs/zmq/patches/010-disable_pedantic_on_linux_with_ulibc++.patch b/libs/zmq/patches/010-disable_pedantic_on_linux_with_ulibc++.patch index f7ecc489e..391941fb5 100644 --- a/libs/zmq/patches/010-disable_pedantic_on_linux_with_ulibc++.patch +++ b/libs/zmq/patches/010-disable_pedantic_on_linux_with_ulibc++.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -148,8 +148,10 @@ case "${host_os}" in +@@ -150,8 +150,10 @@ case "${host_os}" in *linux*) # Define on Linux to enable all library features. Define if using a gnu compiler if test "x$GXX" = "xyes"; then diff --git a/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch b/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch index 3e13e272f..d97a3eb46 100644 --- a/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch +++ b/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch @@ -21,7 +21,7 @@ --- a/src/stream_engine.cpp +++ b/src/stream_engine.cpp -@@ -208,7 +208,7 @@ void zmq::stream_engine_t::plug (io_thre +@@ -208,7 +208,7 @@ void zmq::stream_engine_t::plug (io_thread_t *io_thread_, // Compile metadata. typedef metadata_t::dict_t properties_t; properties_t properties; @@ -30,7 +30,7 @@ zmq_assert (metadata == NULL); metadata = new (std::nothrow) metadata_t (properties); } -@@ -815,7 +815,7 @@ void zmq::stream_engine_t::mechanism_rea +@@ -815,7 +815,7 @@ void zmq::stream_engine_t::mechanism_ready () // If we have a peer_address, add it to metadata if (!peer_address.empty()) {