Skip to contentSkip to conversation

squid: fix references to host headers and libs

PATCH In review Mike Westerhof 3 participants 3 messages Feb 21, 2011 – Feb 22, 2011

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 squid: fix references to host headers and libs

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.

---

recipes/squid/squid_3.1.9.bb +6 -1
index 713b1ea..ecd6fdc 100644
@@ -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() {
Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · 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.

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

Quoted 29 lines

---

recipes/squid/squid_3.1.9.bb +6 -1
index 713b1ea..ecd6fdc 100644
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Signature · 1 line
-Khem
#2 lore raw

В сообщении от Вторник 22 февраля 2011 09:34:04 автор Khem Raj написал:

Quoted 11 lines · Mike Westerhof
Quoted 5 lines

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.

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

Signature · 3 lines
 http://roman.khimov.ru
mailto: [email protected]
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3