mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Armin Kuster
68c8fe1aba
ARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file configure.ac
Hunk #1 succeeded at 27 with fuzz 1 (offset 8 lines).
and others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From 702bd881b66dc034e711c0ff47805f2da40b6e0d Mon Sep 17 00:00:00 2001
|
|
From: Yue Tao <yue.tao@windriver.com>
|
|
Date: Mon, 8 Aug 2016 16:04:33 +0800
|
|
Subject: [PATCH] Set the SYSROOT for libxml2 header file to avoid host
|
|
contamination.
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Yue Tao <yue.tao@windriver.com>
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
|
|
---
|
|
configure.ac | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 504a844..ff4688c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -974,15 +974,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])
|
|
])
|
|
])
|