[meta-webserver][PATCH] apache2: fix config_vars.mk path contamination

[meta-webserver][PATCH] apache2: fix config_vars.mk path contamination

[George McCollister]

Replace contaminated paths with staging paths so apxs can be successfully used
in other recipes to build modules when host and target arch differ.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
index af5c72a..b62fd8c 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
@@ -117,6 +117,10 @@ apache_sysroot_preprocess () {
     sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
     sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
     sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
+    sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
 }
 
 #
-- 
2.4.5

Re: [meta-webserver][PATCH] apache2: fix config_vars.mk path contamination

[akuster808]

George,

Should this be backported to fido and/or dizzy?

- armin

On 10/26/2015 03:05 PM, George McCollister wrote:
> Replace contaminated paths with staging paths so apxs can be successfully used
> in other recipes to build modules when host and target arch differ.
> 
> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> ---
>  meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
> index af5c72a..b62fd8c 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
> @@ -117,6 +117,10 @@ apache_sysroot_preprocess () {
>      sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>      sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>      sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
> +    sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
> +    sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
> +    sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
> +    sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>  }
>  
>  #
> 

Re: [meta-webserver][PATCH] apache2: fix config_vars.mk path contamination

[George McCollister]

Armin,

Probably doesn't need to be. The only recipe I've come across apart
from the one I wrote last week that builds an apache module is in
meta-openstack (mod-wsgi). I'm working with master right now so if it
only works in master that's fine by me.

-George

On Wed, Oct 28, 2015 at 11:23 AM, akuster808 <akuster808@gmail.com> wrote:
> George,
>
> Should this be backported to fido and/or dizzy?
>
> - armin
>
> On 10/26/2015 03:05 PM, George McCollister wrote:
>> Replace contaminated paths with staging paths so apxs can be successfully used
>> in other recipes to build modules when host and target arch differ.
>>
>> Signed-off-by: George McCollister <george.mccollister@gmail.com>
>> ---
>>  meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
>> index af5c72a..b62fd8c 100644
>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.16.bb
>> @@ -117,6 +117,10 @@ apache_sysroot_preprocess () {
>>      sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>>      sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>>      sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>> +    sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>> +    sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>> +    sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>> +    sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk
>>  }
>>
>>  #
>>