squid: fix references to host headers and libs
PATCH 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.
---
recipes/squid/squid_3.1.9.bb +6 -1
@@ -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' \ + -e 's|/opt|${STAGING_DIR_HOST}/opt|g' "$i" + done } do_install_append() {
В сообщении от Понедельник 21 февраля 2011 05:14:11 автор Mike Westerhof написал:
Quoted 4 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.
Signed-off-by Mike Westerhof <[email protected]>
Signature · 3 lines
http://roman.khimov.ru mailto: [email protected] gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3
Quoted 16 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.
Signed-off-by Mike Westerhof <[email protected]>---
recipes/squid/squid_3.1.9.bb +1
-1@@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1"include squid.inc
recipes/squid/squid_3.1.9.bb +0
-0@@ -18,6 +18,11 @@ do_configure_prepend() {
Quoted 6 lines
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 infind ${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
Quoted 11 lines
+ -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
Quoted 27 lines · Khem Raj
Quoted 16 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.
Signed-off-by Mike Westerhof <[email protected]>---
recipes/squid/squid_3.1.9.bb +1
-1@@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" include squid.increcipes/squid/squid_3.1.9.bb do_configure_prepend() { · line 23
Quoted 6 lines
recipes/squid/squid_3.1.9.bb +3
-0@@ -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_EXECPREFIXDIRinstead of ${STAGING_DIR_HOST}/usr
Quoted 5 lines
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)
Quoted 14 lines
Quoted 12 lines
recipes/squid/squid_3.1.9.bb +2
-0+ -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
Quoted 40 lines · Mike Westerhof
Quoted 27 lines · Khem Raj
Quoted 16 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.
Signed-off-by Mike Westerhof <[email protected]>---
recipes/squid/squid_3.1.9.bb +1
-1@@ -1,4 +1,4 @@ -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" include squid.increcipes/squid/squid_3.1.9.bb do_configure_prepend() { · line 23
Quoted 6 lines
recipes/squid/squid_3.1.9.bb +3
-0@@ -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_EXECPREFIXDIRinstead of ${STAGING_DIR_HOST}/usrQuoted 5 lines
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:
Quoted 7 lines
if [ -f
/usr/include/db.h] && grep dbopen/usr/include/db.h; then
exit 0
fi
exit 1I'm simply prefixing those paths with the correct path to the sysroot, so it becomes:
hmmm that wont work then. This would need patching the sourcecode to use $includedir instead of /usr/include
Quoted 30 lines
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 1Would these paths be different for micro, then?
-Mike (mwester)
Quoted 5 lines
Quoted 5 lines
recipes/squid/squid_3.1.9.bb +2
-0+ -e 's|/opt|${STAGING_DIR_HOST}/opt|g' "$i" + done }Quoted 9 lines
Quoted 7 lines
recipes/squid/squid_3.1.9.bb +0
-0do_install_append() {_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
-Khem