b747c29c4e
When APR_INCLUDEDIR and APU_INCLUDEDIR point to the same directory, Apache builds properly. However, with per-package directory support, they point to different directories, and APU_INCLUDEDIR contains both the APR headers and the APU headers. Due to this, the Apache Makefile logic to generate its exports.c file leads to duplicate definitions, because the APR headers are considered twice: once from APR_INCLUDEDIR, once from APU_INCLUDEDIR. We fix this by introducing a patch to the Apache build system. In addition, apr provides a special libtool script that gets used by apr-util and apache. apr-util already had a fixup for this, but apache did not, which was causing the gcc from apr-util per-package directories be used during the apache build, causing build failures. To fix this, we adjust this libtool script to point to the correct tools in apache's per-package directories. There are no autobuilder failures for this, because Apache needs apr-util, and apr-util currently fails to build when BR2_PER_PACKAGE_DIRECTORIES=y. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
123 lines
3.1 KiB
Makefile
123 lines
3.1 KiB
Makefile
################################################################################
|
|
#
|
|
# apache
|
|
#
|
|
################################################################################
|
|
|
|
APACHE_VERSION = 2.4.41
|
|
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
|
|
APACHE_SITE = http://archive.apache.org/dist/httpd
|
|
APACHE_LICENSE = Apache-2.0
|
|
APACHE_LICENSE_FILES = LICENSE
|
|
# Needed for mod_php
|
|
APACHE_INSTALL_STAGING = YES
|
|
# We have a patch touching configure.in and Makefile.in,
|
|
# so we need to autoreconf:
|
|
APACHE_AUTORECONF = YES
|
|
APACHE_DEPENDENCIES = apr apr-util pcre
|
|
|
|
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
|
define APACHE_FIXUP_APR_LIBTOOL
|
|
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \
|
|
$(STAGING_DIR)/usr/build-1/libtool
|
|
endef
|
|
APACHE_POST_CONFIGURE_HOOKS += APACHE_FIXUP_APR_LIBTOOL
|
|
endif
|
|
|
|
APACHE_CONF_ENV= \
|
|
ap_cv_void_ptr_lt_long=no \
|
|
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
|
|
|
|
ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y)
|
|
APACHE_MPM = event
|
|
else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y)
|
|
APACHE_MPM = prefork
|
|
else ifeq ($(BR2_PACKAGE_APACHE_MPM_WORKER),y)
|
|
APACHE_MPM = worker
|
|
endif
|
|
|
|
APACHE_CONF_OPTS = \
|
|
--sysconfdir=/etc/apache2 \
|
|
--with-apr=$(STAGING_DIR)/usr \
|
|
--with-apr-util=$(STAGING_DIR)/usr \
|
|
--with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \
|
|
--enable-http \
|
|
--enable-dbd \
|
|
--enable-proxy \
|
|
--enable-mime-magic \
|
|
--without-suexec-bin \
|
|
--enable-mods-shared=all \
|
|
--with-mpm=$(APACHE_MPM) \
|
|
--disable-luajit
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
|
APACHE_DEPENDENCIES += libxml2
|
|
# Apache wants the path to the header file, where it can find
|
|
# <libxml/parser.h>.
|
|
APACHE_CONF_OPTS += \
|
|
--enable-xml2enc \
|
|
--enable-proxy-html \
|
|
--with-libxml2=$(STAGING_DIR)/usr/include/libxml2
|
|
else
|
|
APACHE_CONF_OPTS += \
|
|
--disable-xml2enc \
|
|
--disable-proxy-html
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LUA),y)
|
|
APACHE_CONF_OPTS += --enable-lua
|
|
APACHE_DEPENDENCIES += lua
|
|
else
|
|
APACHE_CONF_OPTS += --disable-lua
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NGHTTP2),y)
|
|
APACHE_CONF_OPTS += \
|
|
--enable-http2 \
|
|
--with-nghttp2=$(STAGING_DIR)/usr
|
|
APACHE_DEPENDENCIES += nghttp2
|
|
else
|
|
APACHE_CONF_OPTS += --disable-http2
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
APACHE_DEPENDENCIES += openssl
|
|
APACHE_CONF_OPTS += \
|
|
--enable-ssl \
|
|
--with-ssl=$(STAGING_DIR)/usr
|
|
else
|
|
APACHE_CONF_OPTS += --disable-ssl
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
|
APACHE_DEPENDENCIES += zlib
|
|
APACHE_CONF_OPTS += \
|
|
--enable-deflate \
|
|
--with-z=$(STAGING_DIR)/usr
|
|
else
|
|
APACHE_CONF_OPTS += --disable-deflate
|
|
endif
|
|
|
|
define APACHE_FIX_STAGING_APACHE_CONFIG
|
|
$(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs
|
|
$(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk
|
|
endef
|
|
APACHE_POST_INSTALL_STAGING_HOOKS += APACHE_FIX_STAGING_APACHE_CONFIG
|
|
|
|
define APACHE_CLEANUP_TARGET
|
|
$(RM) -rf $(TARGET_DIR)/usr/manual $(TARGET_DIR)/usr/build
|
|
endef
|
|
APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET
|
|
|
|
define APACHE_INSTALL_INIT_SYSV
|
|
$(INSTALL) -D -m 0755 package/apache/S50apache \
|
|
$(TARGET_DIR)/etc/init.d/S50apache
|
|
endef
|
|
|
|
define APACHE_INSTALL_INIT_SYSTEMD
|
|
$(INSTALL) -D -m 644 package/apache/apache.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/apache.service
|
|
endef
|
|
|
|
$(eval $(autotools-package))
|