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

apache: fix depends

Browse source 
- helps build system to locate zlib
- adds depend on libgdbm if libaprutil-dbm-gdbm is selected

This fixes the two different build failures that can currently be
observed.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2020-01-13 21:43:42 +01:00
parent 1d25dcde24
commit d6476f30bb
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
net/apache/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apache PKG_NAME:=apache
PKG_VERSION:=2.4.41 PKG_VERSION:=2.4.41
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_NAME:=httpd PKG_SOURCE_NAME:=httpd
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
@ -40,7 +40,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_apache-mod-session-crypto \ CONFIG_PACKAGE_apache-mod-session-crypto \
CONFIG_PACKAGE_apache-mod-suexec \ CONFIG_PACKAGE_apache-mod-suexec \
CONFIG_PACKAGE_apache-mod-webdav \ CONFIG_PACKAGE_apache-mod-webdav \
CONFIG_PACKAGE_apache-suexec CONFIG_PACKAGE_apache-suexec \
CONFIG_PACKAGE_libaprutil-dbm-gdbm
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -67,7 +68,7 @@ endef
define Package/apache define Package/apache
$(call Package/apache/Default) $(call Package/apache/Default)
USERID:=apache=377:apache=377 USERID:=apache=377:apache=377
DEPENDS:=+libapr +libaprutil +libpcre DEPENDS:=+PACKAGE_libaprutil-dbm-gdbm:libgdbm +libapr +libaprutil +libpcre
endef endef
define Package/apache/description define Package/apache/description
@ -169,7 +170,6 @@ define Package/apache/install/mod
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--$(if $(CONFIG_PACKAGE_apache-mod-deflate),en,dis)able-deflate \
--$(if $(CONFIG_PACKAGE_apache-mod-http2),en,dis)able-http2 \ --$(if $(CONFIG_PACKAGE_apache-mod-http2),en,dis)able-http2 \
--$(if $(CONFIG_PACKAGE_apache-mod-lua),en,dis)able-lua \ --$(if $(CONFIG_PACKAGE_apache-mod-lua),en,dis)able-lua \
--$(if $(CONFIG_PACKAGE_apache-mod-md),en,dis)able-md \ --$(if $(CONFIG_PACKAGE_apache-mod-md),en,dis)able-md \
@ -201,6 +201,16 @@ CONFIGURE_ARGS+= \
--with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \
--with-ssl --with-ssl
ifneq ($(CONFIG_PACKAGE_apache-mod-deflate),)
CONFIGURE_ARGS+= \
--enable-deflate \
--with-z="$(STAGING_DIR)/usr"
else
CONFIGURE_ARGS+= \
--disable-deflate \
--without-z
endif
ifneq ($(CONFIG_PACKAGE_apache-mod-ldap),) ifneq ($(CONFIG_PACKAGE_apache-mod-ldap),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-authnz-ldap \ --enable-authnz-ldap \