X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Flibs%2Fustream-ssl%2FMakefile;h=2ea5bf0bd59a6319b63913a11477c0cd13376f41;hp=71264651aee043b2b86d2b6bd9f3b407cf8a731b;hb=33fd1d0d91fe6f0bb639a6fad0f681ba651f8254;hpb=7eeb254cc49c4e9f837c980826ec112b9404f341 diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 71264651ae..2ea5bf0bd5 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -1,17 +1,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ustream-ssl -PKG_VERSION:=2016-02-21 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=$(OPENWRT_GIT)/project/ustream-ssl.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=6ba14990e63fc956e8aff3b0b09be1fd3aaa6d75 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git +PKG_SOURCE_DATE:=2018-07-30 +PKG_SOURCE_VERSION:=23a3f2830341acd1db149175baf7315a33bd0edb +PKG_MIRROR_HASH:=289bef5dac684015b6a40cfd72cf1c8c297bb77cf2efd54e562b628ba3afd83d 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:= @@ -36,19 +35,11 @@ define Package/libustream-openssl VARIANT:=openssl endef -define Package/libustream-cyassl +define Package/libustream-wolfssl $(Package/libustream/default) - TITLE += (cyassl) - DEPENDS += +PACKAGE_libustream-cyassl:libcyassl - VARIANT:=cyassl -endef - -define Package/libustream-polarssl - $(Package/libustream/default) - TITLE += (polarssl) - DEPENDS += +libpolarssl - VARIANT:=polarssl - DEFAULT_VARIANT:=1 + TITLE += (wolfssl) + DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl + VARIANT:=wolfssl endef define Package/libustream-mbedtls @@ -59,13 +50,10 @@ define Package/libustream-mbedtls DEFAULT_VARIANT:=1 endef -ifeq ($(BUILD_VARIANT),cyassl) +ifeq ($(BUILD_VARIANT),wolfssl) TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl -DHAVE_SNI CMAKE_OPTIONS += -DCYASSL=on endif -ifeq ($(BUILD_VARIANT),polarssl) - CMAKE_OPTIONS += -DPOLARSSL=on -endif ifeq ($(BUILD_VARIANT),mbedtls) CMAKE_OPTIONS += -DMBEDTLS=on endif @@ -76,11 +64,9 @@ define Package/libustream/default/install 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-wolfssl/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-wolfssl)) $(eval $(call BuildPackage,libustream-openssl))