aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons/squid/files
diff options
context:
space:
mode:
authorYue Tao <yue.tao@windriver.com>2016-08-08 16:04:33 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2016-08-16 21:26:10 -0400
commit4307c6a746ef25540c84446c821658062a89bb15 (patch)
treed88ab958ed0a3d3183ed1935897735597a7a8e33 /meta-networking/recipes-daemons/squid/files
parentf849b9fd1eb53cacb9c0b0205e1b469ec1d53779 (diff)
downloadmeta-openembedded-4307c6a746ef25540c84446c821658062a89bb15.tar.gz
meta-openembedded-4307c6a746ef25540c84446c821658062a89bb15.tar.bz2
meta-openembedded-4307c6a746ef25540c84446c821658062a89bb15.zip
squid: fix configure host contamination
When configuring squid with --enable-esi option, the following error was observed: [snip] checking libxml/parser.h usability... no checking libxml/parser.h presence... no checking for libxml/parser.h... no configure: Failed to find libxml2 header file libxml/parser.h [snip] ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. [snip] It tried to search libxml header file in host path. Set the SYSROOT to avoid this host contamination. Signed-off-by: Yue Tao <yue.tao@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files')
-rw-r--r--meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
new file mode 100644
index 000000000..68733f911
--- /dev/null
+++ b/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac.old b/configure.ac
+index 54eda73..874f48e 100644
+--- a/configure.ac.old
++++ b/configure.ac
+@@ -964,15 +964,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a "x$with_libxml2" != "xno" ; then
+ dnl Find the main header and include path...
+ AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [
+ AC_CHECK_HEADERS([libxml/parser.h], [], [
+- AC_MSG_NOTICE([Testing in /usr/include/libxml2])
++ AC_MSG_NOTICE([Testing in $SYSROOT/usr/include/libxml2])
+ SAVED_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS"
++ CPPFLAGS="-I$SYSROOT/usr/include/libxml2 $CPPFLAGS"
+ unset ac_cv_header_libxml_parser_h
+- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [
+- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2])
+- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS"
++ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I$SYSROOT/usr/include/libxml2"], [
++ AC_MSG_NOTICE([Testing in $SYSROOT/usr/local/include/libxml2])
++ CPPFLAGS="-I$SYSROOT/usr/local/include/libxml2 $SAVED_CPPFLAGS"
+ unset ac_cv_header_libxml_parser_h
+- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [
++ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I$SYSROOT/usr/local/include/libxml2"], [
+ AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h])
+ ])
+ ])