1
0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-15 03:43:53 +02:00

Merge pull request #6077 from MikePetullo/lede-17.01-lighttpd

lighttpd: CONFIG_LIGHTTPD_SSL includes mod_openssl
This commit is contained in:
Hannu Nyman 2018-05-21 08:23:30 +03:00 committed by GitHub
commit 338690b2f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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:=http://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 \
@ -72,6 +76,7 @@ CONFIGURE_VARS+= \
ifneq ($(strip $(CONFIG_LIGHTTPD_SSL)),)
CONFIGURE_ARGS+= \
--with-openssl="$(STAGING_DIR)/usr"
BASE_MODULES+= openssl
else
CONFIGURE_ARGS+= \
--without-openssl
@ -117,7 +122,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