From 20506c8cb4369a219ecfa892065917b930b910a5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 22 Oct 2012 15:22:53 +0100 Subject: apache2: avoid injecting host include path includedir (by way of EXTRA_INCLUDES) gets into the CFLAGS of modphp via apxs; thus it should not point to a location on the host. Signed-off-by: Paul Eggleton --- meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-webserver/recipes-httpd/apache2') diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb index 5857be7ded..af7840d1a5 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://httpd.apache.org/" DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r2" +PR = "r3" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://server-makefile.patch \ @@ -93,6 +93,7 @@ apache_sysroot_preprocess () { sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk + sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${PN}/build/config_vars.mk } # -- cgit 1.2.3-korg