X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Flibs%2Fustream-ssl%2FMakefile;h=b9b9e19dfb1157faa375230598e0307ef279d675;hb=f609913b5c60f7c65c462730993cd1c752083fd6;hp=9fef5e7f1999cd1911c6e039ca91a75a4b542ed3;hpb=aca0690ce53aa092cf9273ac0e4598bf652e0990;p=openwrt%2Fstaging%2Fchunkeey.git diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 9fef5e7f19..b9b9e19dfb 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -1,22 +1,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ustream-ssl -PKG_VERSION:=2013-01-22 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://nbd.name/ustream-ssl.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=da607e6272d789ed5dae3b0efff90912fda6f81f -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_URL=$(LEDE_GIT)/project/ustream-ssl.git +PKG_SOURCE_DATE:=2016-07-02 +PKG_SOURCE_VERSION:=ec80adaa1b47f28d426fa19c692011ce60b992d6 +PKG_MIRROR_HASH:=bfbad6b4e8c1e933f0bfaab43cbdd44a536c08128c3a779e6f2395a6a886aab7 CMAKE_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) PKG_LICENSE:=ISC PKG_LICENSE_FILES:= -PKG_MAINTAINER:=Felix Fietkau +PKG_MAINTAINER:=Felix Fietkau include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -26,6 +25,7 @@ define Package/libustream/default CATEGORY:=Libraries TITLE:=ustream SSL Library DEPENDS:=+libubox + ABI_VERSION:=$(PKG_VERSION) endef define Package/libustream-openssl @@ -42,10 +42,21 @@ define Package/libustream-cyassl VARIANT:=cyassl endef +define Package/libustream-mbedtls + $(Package/libustream/default) + TITLE += (mbedtls) + DEPENDS += +libmbedtls + VARIANT:=mbedtls + DEFAULT_VARIANT:=1 +endef + ifeq ($(BUILD_VARIANT),cyassl) - TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl + TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl -DHAVE_SNI CMAKE_OPTIONS += -DCYASSL=on endif +ifeq ($(BUILD_VARIANT),mbedtls) + CMAKE_OPTIONS += -DMBEDTLS=on +endif define Package/libustream/default/install $(INSTALL_DIR) $(1)/lib/ @@ -54,6 +65,8 @@ endef Package/libustream-openssl/install = $(Package/libustream/default/install) Package/libustream-cyassl/install = $(Package/libustream/default/install) +Package/libustream-mbedtls/install = $(Package/libustream/default/install) +$(eval $(call BuildPackage,libustream-mbedtls)) $(eval $(call BuildPackage,libustream-cyassl)) $(eval $(call BuildPackage,libustream-openssl))