Browse Source

lighttpd: CONFIG_LIGHTTPD_SSL includes mod_openssl

If we're built with CONFIG_LIGHTTPD_SSL then mod_openssl.so should
be included into the base package. Fixes issue #5343.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
lilik-openwrt-22.03
Philip Prindeville 7 years ago
parent
commit
e13fbbad62
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      net/lighttpd/Makefile

+ 7
- 2
net/lighttpd/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lighttpd
PKG_VERSION:=1.4.48
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://download.lighttpd.net/lighttpd/releases-1.4.x
@ -21,6 +21,8 @@ PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_CONFIG_DEPENDS:=CONFIG_LIGHTTPD_SSL
include $(INCLUDE_DIR)/package.mk
define Package/lighttpd/Default
@ -49,6 +51,8 @@ config LIGHTTPD_SSL
lighttpd confguration file.
endef
BASE_MODULES:=dirlisting indexfile staticfile
CONFIGURE_ARGS+= \
--libdir=/usr/lib/lighttpd \
--sysconfdir=/etc/lighttpd \
@ -68,6 +72,7 @@ CONFIGURE_VARS+= \
ifneq ($(strip $(CONFIG_LIGHTTPD_SSL)),)
CONFIGURE_ARGS+= \
--with-openssl="$(STAGING_DIR)/usr"
BASE_MODULES+= openssl
else
CONFIGURE_ARGS+= \
--without-openssl
@ -153,7 +158,7 @@ define Package/lighttpd/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/lighttpd.init $(1)/etc/init.d/lighttpd
$(INSTALL_DIR) $(1)/usr/lib/lighttpd
for m in dirlisting indexfile staticfile; do \
for m in $(BASE_MODULES); do \
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$$${m}.so $(1)/usr/lib/lighttpd/ ; \
done
$(INSTALL_DIR) $(1)/usr/sbin


Loading…
Cancel
Save