From 20a7734215aa844d5e961ee846f7048b04361838 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Thu, 4 Jun 2015 13:09:04 -0400 Subject: [PATCH] Revert "zmq: Make CurveZMQ security (libsodium) optional, cleanup descrition and dependencies" This reverts commit 2cd58bca3876028f15bdd6a97c50c2e614013bf8. --- libs/zmq/Makefile | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile index 515d6face..31bf6bf6b 100644 --- a/libs/zmq/Makefile +++ b/libs/zmq/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zeromq PKG_VERSION:=4.0.5 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_MAINTAINER:=Dirk Chang PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=LICENCE.txt @@ -31,26 +31,28 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk -define Package/libzmq - TITLE:=ZeroMQ - Message Queue engine +define Package/libzmq/Default + TITLE:=ZeroMQ - Code Connected URL:=http://www.zeromq.org/ - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libuuid +libpthread +librt +PACKAGE_libsodium:libsodium $(CXX_DEPENDS) - MENU:=1 endef -define Package/libzmq/config - config LIBZMQ_CURVEZMQ - bool "Include support for CurveZMQ security" - depends on PACKAGE_libzmq - default y - select PACKAGE_libsodium +define Package/libzmq/Default/description + A replacment for raw socket developing library +endef + +define Package/libzmq + $(call Package/libzmq/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libuuid +libpthread +librt $(CXX_DEPENDS) + TITLE+= (library) + URL:= endef define Package/libzmq/description - This package contains the ZeroMQ messaging engine shared library. - CurveZMQ security protocols are optional using libsodium. + $(call Package/libzmq/Default/description) + This package contains the ZeroMQ shared library, used by other + programs. endef # add extra configure flags here