X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fzmq%2FMakefile;h=c9dccd0a7b3d50c025699983a536ebc2639e1d0f;hb=7536aebe63686f5533d081dbb97bc3cbe60b7063;hp=ce614cfe282c1a71bb7646a2f4e1781da05e649a;hpb=d29ec52a5895f06dd9f31062b52ebb7f2ac0f49f;p=feed%2Fpackages.git

diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile
index ce614cfe28..c9dccd0a7b 100644
--- a/libs/zmq/Makefile
+++ b/libs/zmq/Makefile
@@ -10,19 +10,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zeromq
-PKG_VERSION:=4.3.4
+PKG_VERSION:=4.3.5
 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:=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
+PKG_HASH:=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
 
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENCE.txt
 PKG_CPE_ID:=cpe:/a:zeromq:libzmq
 
-PKG_BUILD_PARALLEL:=1
 CMAKE_BINARY_SUBDIR:=openwrt-build
 
 include $(INCLUDE_DIR)/package.mk
@@ -33,20 +32,28 @@ define Package/libzmq/default
   URL:=http://www.zeromq.org/
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libuuid +libpthread +librt +libstdcpp +USE_GLIBC:libbsd
+  DEPENDS:=+libuuid +libstdcpp
   PROVIDES:=libzmq
 endef
 
+define Package/libzmq/default-config
+config LIBZMQ_$(2)_WITH_OPENPGM
+	depends on PACKAGE_libzmq-$(1)
+	bool "enable openpgm support for libzmq-$(1)"
+	default n
+endef
+
 define Package/libzmq-nc
   $(call Package/libzmq/default)
   VARIANT:=nc
+  DEPENDS+=+LIBZMQ_NC_WITH_OPENPGM:openpgm
 endef
 
 define Package/libzmq-curve
   $(call Package/libzmq/default)
   VARIANT:=curve
   TITLE+= (CurveZMQ)
-  DEPENDS+=+libsodium
+  DEPENDS+=+libsodium +LIBZMQ_CURVE_WITH_OPENPGM:openpgm
 endef
 
 define Package/libzmq-nc/description
@@ -58,11 +65,18 @@ define Package/libzmq-curve/description
  Includes CurveZMQ security by libsodium.
 endef
 
+define Package/libzmq-nc/config
+	$(call Package/libzmq/default-config,nc,NC)
+endef
+
+define Package/libzmq-curve/config
+	$(call Package/libzmq/default-config,curve,CURVE)
+endef
+
 CMAKE_OPTIONS += \
 	-DA2X_EXECUTABLE=OFF \
 	-DASCIIDOC_EXECUTABLE=OFF \
 	-DBUILD_STATIC=OFF \
-	-DCMAKE_SKIP_INSTALL_RPATH=ON \
 	-DZMQ_HAVE_SOCK_CLOEXEC=ON \
 	-DZMQ_HAVE_SO_KEEPALIVE=ON \
 	-DZMQ_HAVE_TCP_KEEPCNT=ON \
@@ -73,9 +87,7 @@ CMAKE_OPTIONS += \
 	-DENABLE_EVENTFD=ON \
 	-DPOLLER=epoll \
 	-DRT_LIBRARY=OFF \
-	-DWITH_OPENPGM=OFF \
-	-DZMQ_BUILD_TESTS=OFF \
-	-DWITH_LIBBSD=O$(if $(CONFIG_USE_GLIBC),N,FF)
+	-DZMQ_BUILD_TESTS=OFF
 
 ifeq ($(BUILD_VARIANT),curve)
 	CMAKE_OPTIONS += -DWITH_LIBSODIUM=ON
@@ -83,6 +95,14 @@ else
   	CMAKE_OPTIONS += -DWITH_LIBSODIUM=OFF
 endif
 
+ifeq ($(CONFIG_LIBZMQ_NC_WITH_OPENPGM),y)
+	CMAKE_OPTIONS += -DWITH_OPENPGM=ON
+else ifeq ($(CONFIG_LIBZMQ_CURVE_WITH_OPENPGM),y)
+	CMAKE_OPTIONS += -DWITH_OPENPGM=ON
+else
+	CMAKE_OPTIONS += -DWITH_OPENPGM=OFF
+endif
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/zmq.h $(1)/usr/include