Signed-off-by: Nathan Hintz <[email protected]> --- package/network/services/uhttpd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 6194f4b..8f41109 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -18,7 +18,7 @@ PKG_SOURCE_VERSION:=fae8886f8aa5d996c8de607abea8b677216549b5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Felix Fietkau <[email protected]> -PKG_BUILD_DEPENDS = ustream-ssl +PKG_BUILD_DEPENDS:= +CONFIG_uhttpd-mod-tls_cyassl:libustream-cyassl +CONFIG_uhttpd-mod-tls_openssl:libustream-openssl include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -51,7 +51,7 @@ endef define Package/uhttpd-mod-tls $(Package/uhttpd/default) TITLE+= (TLS plugin) - DEPENDS:=uhttpd +PACKAGE_uhttpd-mod-tls_cyassl:libustream-cyassl +PACKAGE_uhttpd-mod-tls_openssl:libustream-openssl + DEPENDS:=uhttpd +CONFIG_uhttpd-mod-tls_cyassl:libustream-cyassl +CONFIG_uhttpd-mod-tls_openssl:libustream-openssl endef define Package/uhttpd-mod-tls/description @@ -62,12 +62,12 @@ define Package/uhttpd-mod-tls/config choice depends on PACKAGE_uhttpd-mod-tls prompt "TLS Provider" - default PACKAGE_uhttpd-mod-tls_cyassl + default CONFIG_uhttpd-mod-tls_cyassl - config PACKAGE_uhttpd-mod-tls_cyassl + config CONFIG_uhttpd-mod-tls_cyassl bool "CyaSSL" - config PACKAGE_uhttpd-mod-tls_openssl + config CONFIG_uhttpd-mod-tls_openssl bool "OpenSSL" endchoice endef @@ -102,7 +102,7 @@ endef TARGET_LDFLAGS += -lcrypt -CMAKE_OPTIONS = -DTLS_SUPPORT=on +CMAKE_OPTIONS = $(if $(PACKAGE_uhttpd-mod-tls),-DTLS_SUPPORT=on,-DTLS_SUPPORT=off) define Package/uhttpd/install $(INSTALL_DIR) $(1)/etc/init.d -- 1.8.3.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
