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

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

[Mike Westerhof]

This patch changes hard-coded references to /usr and /opt in the various
squid config.test scripts to point to the correct sysroot paths.
This version accommodates the strange staging dir layout used by micro.

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}${exec_prefix}|g' \
+                  -e 's|/opt|${STAGING_DIR_HOST}/opt|g' "$i"
+       done
 }

 do_install_append() {

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

[Khem Raj]

On (21/02/11 13:13), Mike Westerhof 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.
> This version accommodates the strange staging dir layout used by micro.
> 
> Signed-off-by: Mike Westerhof <mike@mwester.net>

this patch is good. It does not break micro more than what it would be
without this patch

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
> 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}${exec_prefix}|g' \
> +                  -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

-- 
-Khem

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

[Roman I Khimov]

[-- Attachment #1: Type: Text/Plain, Size: 755 bytes --]

В сообщении от Вторник 22 февраля 2011 09:34:04 автор Khem Raj написал:
> On (21/02/11 13:13), Mike Westerhof 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.
> > This version accommodates the strange staging dir layout used by micro.
> > 
> > Signed-off-by: Mike Westerhof <mike@mwester.net>
> 
> this patch is good. It does not break micro more than what it would be
> without this patch
> 
> Acked-by: Khem Raj <raj.khem@gmail.com>

Acked-by: Roman I Khimov <khimov@altell.ru>

-- 
 http://roman.khimov.ru
mailto: roman@khimov.ru
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 205 bytes --]