22e63d952e
Since the apache package was introduced, --enable-nonportable-atomics=yes was passed when BR2_ARCH_HAS_ATOMICS. However, Apache doesn't take this option: it only passes it down when building the APR library. But since we're building APR separately, this statement had no effect. So this commit removes the useless code from the Apache package, and instead adds the appropriate logic to the apr package, using the new BR2_TOOLCHAIN_HAS_SYNC_x symbols rather than BR2_ARCH_HAS_ATOMICS. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
82 lines
2.1 KiB
Makefile
82 lines
2.1 KiB
Makefile
################################################################################
|
|
#
|
|
# apache
|
|
#
|
|
################################################################################
|
|
|
|
APACHE_VERSION = 2.4.18
|
|
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
|
|
|
|
APACHE_CONF_ENV= \
|
|
ap_cv_void_ptr_lt_long=no \
|
|
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
|
|
|
|
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=worker \
|
|
--disable-lua \
|
|
--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_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
|
|
|
|
$(eval $(autotools-package))
|