lede-packages-rs

commit 345e344935d715641302d3da3f4ee5d517adc53a
parent b2667577c3d2bd335aa4650dac51118f76522257
Author: Ted Hess <thess@kitschensync.net>
Date:   Fri, 15 May 2015 10:48:38 -0400

Merge pull request #1257 from thess/zmq-work

zmq: Make libsodium optional
Diffstat:
M
lang/lzmq/Makefile
 | 
8
++++----
M
libs/zmq/Makefile
 | 
32
+++++++++++++++-----------------

2 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/lang/lzmq/Makefile b/lang/lzmq/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lzmq
 PKG_VERSION:=0.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=MIT
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
-PKG_SOURCE_URL:=https://codeload.github.com/zeromq/lzmq/zip/v0.4.2?
-PKG_MD5SUM:=6789895c925e7eb9036e526181ec1a33
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/zeromq/lzmq/tar.gz/v0.4.2?
+PKG_MD5SUM:=ec9e15bd1495f4c87959fe22a368523d
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git 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:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=LICENCE.txt
@@ -31,28 +31,26 @@ PKG_INSTALL:=1
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libzmq/Default
-  TITLE:=ZeroMQ - Code Connected 
-  URL:=http://www.zeromq.org/
-endef
-
-define Package/libzmq/Default/description
-  A replacment for raw socket developing library 
-endef
-
 define Package/libzmq
-  $(call Package/libzmq/Default)
+  TITLE:=ZeroMQ - Message Queue engine
+  URL:=http://www.zeromq.org/
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libuuid +libpthread +librt +libsodium $(CXX_DEPENDS)
-  TITLE+= (library)
-  URL:=
+  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
 endef
 
 define Package/libzmq/description
-  $(call Package/libzmq/Default/description)
- This package contains the ZeroMQ shared library, used by other
- programs.
+ This package contains the ZeroMQ messaging engine shared library.
+ CurveZMQ security protocols are optional using libsodium.
 endef
 
 # add extra configure flags here