Re: [PATCH] squid: fix references to host headers and libs

[Mike Westerhof <mike@mwester.net>]

On 2/21/2011 2:34 AM, Khem Raj wrote:
> On Sun, Feb 20, 2011 at 6:14 PM, Mike Westerhof <mike@mwester.net> wrote:
>> This patch changes hard-coded references to /usr and /opt in the various
>> squid config.test scripts to point to the correct sysroot paths.
>>
>> Signed-off-by: Mike Westerhof <mike@mwester.net>
>> ---
>> diff --git a/recipes/squid/squid_3.1.9.bb b/recipes/squid/squid_3.1.9.bb
>> index 713b1ea..ecd6fdc 100644
>> --- a/recipes/squid/squid_3.1.9.bb
>> +++ b/recipes/squid/squid_3.1.9.bb
>> @@ -1,4 +1,4 @@
>> -PR = "${INC_PR}.0"
>> +PR = "${INC_PR}.1"
>>
>>  include squid.inc
>>
>> @@ -18,6 +18,11 @@ do_configure_prepend() {
>>        export ac_cv_epoll_ctl=yes
>>        export ac_cv_epoll_works=yes
>>        export ac_cv_func_setresuid=yes
>> +       # Patch up the various config scripts to refer to sysroot
>> +       for i in `find ${S} -name config.test`; do
>> +           sed -i -e 's|/usr|${STAGING_DIR_HOST}/usr|g' \
> 
> I dont know if this works for say micro distro. May be using
>  STAGING_EXECPREFIXDIR instead of ${STAGING_DIR_HOST}/usr
> 
> or using
> 
>  ${STAGING_DIR_HOST}${exec_prefix}
> 
> would be more portable

Does micro actually change the structure of the *staging*
directories, then?

What I'm trying to do here is perhaps best expressed by example.
Here's a few lines from one of those config.test files:

if [ -f /usr/include/db.h ] && grep dbopen /usr/include/db.h; then
    exit 0
fi
exit 1

I'm simply prefixing those paths with the correct path to the
sysroot, so it becomes:

if [ -f /r/slug/tmp/sysroots/armv5te-oe-linux-gnueabi/usr/include/db.h ] && grep dbopen /r/slug/tmp/sysroots/armv5te-oe-linux-gnueabi/usr/include/db.h; then
    exit 0
fi
exit 1

Would these paths be different for micro, then?

-Mike (mwester)

> 
>> +                  -e 's|/opt|${STAGING_DIR_HOST}/opt|g' "$i"
>> +       done
>>  }
>>
>>  do_install_append() {
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
> 
>