aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-16 00:20:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-16 00:20:01 +0000
commitd9494cdf6dab6cf4c1b74f4031e9492d31f1c3dc (patch)
tree1c8a445fbfb375acfbadc079f494507761d43726
parent5bd5c3282b31f2a19907a32fae06a5c05420bcba (diff)
downloadupstream-d9494cdf6dab6cf4c1b74f4031e9492d31f1c3dc.tar.gz
upstream-d9494cdf6dab6cf4c1b74f4031e9492d31f1c3dc.tar.bz2
upstream-d9494cdf6dab6cf4c1b74f4031e9492d31f1c3dc.zip
ustream-ssl: update to the latest version, adds mbedtls variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48256
-rw-r--r--package/libs/ustream-ssl/Makefile17
1 files changed, 15 insertions, 2 deletions
diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile
index cd9b2fe8a3..509709cd71 100644
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -1,13 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ustream-ssl
-PKG_VERSION:=2015-07-09
+PKG_VERSION:=2016-01-15
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(OPENWRT_GIT)/project/ustream-ssl.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c2d73c22618e8ee444e8d346695eca908ecb72d3
+PKG_SOURCE_VERSION:=0c4f5c2493a4a9bbff28efd9661a967fe95e7495
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1
@@ -51,6 +51,14 @@ define Package/libustream-polarssl
DEFAULT_VARIANT:=1
endef
+define Package/libustream-mbedtls
+ $(Package/libustream/default)
+ TITLE += (polarssl)
+ DEPENDS += +libmbedtls
+ VARIANT:=mbedtls
+ DEFAULT_VARIANT:=1
+endef
+
ifeq ($(BUILD_VARIANT),cyassl)
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl -DHAVE_SNI
CMAKE_OPTIONS += -DCYASSL=on
@@ -58,6 +66,9 @@ endif
ifeq ($(BUILD_VARIANT),polarssl)
CMAKE_OPTIONS += -DPOLARSSL=on
endif
+ifeq ($(BUILD_VARIANT),mbedtls)
+ CMAKE_OPTIONS += -DMBEDTLS=on
+endif
define Package/libustream/default/install
$(INSTALL_DIR) $(1)/lib/
@@ -67,7 +78,9 @@ endef
Package/libustream-openssl/install = $(Package/libustream/default/install)
Package/libustream-cyassl/install = $(Package/libustream/default/install)
Package/libustream-polarssl/install = $(Package/libustream/default/install)
+Package/libustream-mbedtls/install = $(Package/libustream/default/install)
$(eval $(call BuildPackage,libustream-polarssl))
+$(eval $(call BuildPackage,libustream-mbedtls))
$(eval $(call BuildPackage,libustream-cyassl))
$(eval $(call BuildPackage,libustream-openssl))