Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lighttpd: cleaner TLS dependency logic in Makefile

Browse source 
incorporate suggestion from cotequeiroz (Eneas U de Queiroz)
https://github.com/openwrt/packages/issues/14142#issuecomment-739583111

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
This commit is contained in:
Glenn Strauss 2020-12-17 05:15:43 -05:00
parent 33bbeceaa7
commit 8f46b79c20
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
net/lighttpd/Makefile
View file

@ -57,6 +57,17 @@ config LIGHTTPD_SSL
your lighttpd configuration file. your lighttpd configuration file.
(mod_gnutls, mod_mbedtls, mod_nss, mod_openssl, mod_wolfssl) (mod_gnutls, mod_mbedtls, mod_nss, mod_openssl, mod_wolfssl)
config LIGHTTPD_SSL_DEPENDS
bool
depends on LIGHTTPD_SSL
default PACKAGE_lighttpd-mod-mbedtls || PACKAGE_lighttpd-mod-wolfssl || PACKAGE_lighttpd-mod-gnutls || PACKAGE_lighttpd-mod-nss
config LIGHTTPD_SSL_SELECT
tristate
depends on LIGHTTPD_SSL
default m if !LIGHTTPD_SSL_DEPENDS
select PACKAGE_lighttpd-mod-openssl
config LIGHTTPD_LOGROTATE config LIGHTTPD_LOGROTATE
bool "Logrotate support" bool "Logrotate support"
depends on PACKAGE_lighttpd depends on PACKAGE_lighttpd
@ -65,26 +76,6 @@ config LIGHTTPD_LOGROTATE
It adds support for logrotate functionality. It adds support for logrotate functionality.
endef endef
ifneq ($(strip $(CONFIG_LIGHTTPD_SSL)),)
ifeq ($(CONFIG_PACKAGE_lighttpd-mod-openssl),)
ifeq ($(CONFIG_PACKAGE_lighttpd-mod-mbedtls),)
ifeq ($(CONFIG_PACKAGE_lighttpd-mod-wolfssl),)
ifeq ($(CONFIG_PACKAGE_lighttpd-mod-gnutls),)
ifeq ($(CONFIG_PACKAGE_lighttpd-mod-nss),)
CONFIG_PACKAGE_lighttpd-mod-openssl=m
endif
endif
endif
endif
endif
endif
ifneq ($(CONFIG_PACKAGE_lighttpd-mod-auth),)
ifeq ($(CONFIG_PACKAGE_lighttpd-mod-authn_file),)
CONFIG_PACKAGE_lighttpd-mod-authn_file=m
endif
endif
MESON_ARGS += \ MESON_ARGS += \
-Dwith_brotli=false \ -Dwith_brotli=false \
-Dwith_bzip=false \ -Dwith_bzip=false \