mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +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>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From b4943594654cd340b95aabdc2f3750a4705cc0de Mon Sep 17 00:00:00 2001
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Mon, 21 Oct 2013 12:50:44 -0400
|
|
Subject: [PATCH] Fix flawed dynamic -ldb link test in configure
|
|
|
|
The test uses dbopen, but just ignores the fact
|
|
that this function may not exist in the db version
|
|
used. This leads to the dynamic link test failing
|
|
and the configure script just making assumptions
|
|
about why and setting the need for -ldb incorrectly.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
|
|
---
|
|
configure.ac | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 57cd1ac..3827222 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -3229,8 +3229,16 @@ AC_CHECK_DECL(dbopen,,,[
|
|
#include <db.h>
|
|
#endif])
|
|
|
|
-dnl 1.85
|
|
-SQUID_CHECK_DBOPEN_NEEDS_LIBDB
|
|
+if test "x$ac_cv_have_decl_dbopen" = "xyes"; then
|
|
+ dnl 1.85
|
|
+ SQUID_CHECK_DBOPEN_NEEDS_LIBDB
|
|
+else
|
|
+ # dbopen isn't there. So instead of running a compile/link test that
|
|
+ # uses it and is thus guaranteed to fail, we just assume that we will
|
|
+ # need to link in the db library, rather than fabricate some other
|
|
+ # dynamic compile/link test.
|
|
+ ac_cv_dbopen_libdb="yes"
|
|
+fi
|
|
if test "x$ac_cv_dbopen_libdb" = "xyes"; then
|
|
LIB_DB="-ldb"
|
|
fi
|