diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:25:18 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:40 -0700 |
commit | 68c8fe1aba92ca2ed5e1156fa0050609ab4f73af (patch) | |
tree | 0b97556ce77ef357924cab0df45284778f8a08f6 /meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch | |
parent | c3b41c1f3cdb3f2c4b39e295c36c01a1b43abb74 (diff) | |
download | meta-openembedded-68c8fe1aba92ca2ed5e1156fa0050609ab4f73af.tar.gz |
squid: refresh patches
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>
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch')
-rw-r--r-- | meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch index 2304c5f1dd..25f68aff8f 100644 --- a/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch +++ b/meta-networking/recipes-daemons/squid/files/Fix-flawed-dynamic-ldb-link-test-in-configure.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From 0d5b337ff5ef7dd48f970f08bd95d6327917cfd1 Mon Sep 17 00:00:00 2001 | 1 | From b4943594654cd340b95aabdc2f3750a4705cc0de Mon Sep 17 00:00:00 2001 |
2 | Message-Id: <0d5b337ff5ef7dd48f970f08bd95d6327917cfd1.1382375807.git.Jim.Somerville@windriver.com> | ||
3 | From: Jim Somerville <Jim.Somerville@windriver.com> | 2 | From: Jim Somerville <Jim.Somerville@windriver.com> |
4 | Date: Mon, 21 Oct 2013 12:50:44 -0400 | 3 | Date: Mon, 21 Oct 2013 12:50:44 -0400 |
5 | Subject: [PATCH 1/1] Fix flawed dynamic -ldb link test in configure | 4 | Subject: [PATCH] Fix flawed dynamic -ldb link test in configure |
6 | 5 | ||
7 | The test uses dbopen, but just ignores the fact | 6 | The test uses dbopen, but just ignores the fact |
8 | that this function may not exist in the db version | 7 | that this function may not exist in the db version |
@@ -11,15 +10,16 @@ and the configure script just making assumptions | |||
11 | about why and setting the need for -ldb incorrectly. | 10 | about why and setting the need for -ldb incorrectly. |
12 | 11 | ||
13 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> | 12 | Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com> |
13 | |||
14 | --- | 14 | --- |
15 | configure.ac | 12 ++++++++++-- | 15 | configure.ac | 12 ++++++++++-- |
16 | 1 files changed, 10 insertions(+), 2 deletions(-) | 16 | 1 file changed, 10 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
19 | index 962a748..42e6a93 100644 | 19 | index 57cd1ac..3827222 100644 |
20 | --- a/configure.ac | 20 | --- a/configure.ac |
21 | +++ b/configure.ac | 21 | +++ b/configure.ac |
22 | @@ -3051,8 +3051,16 @@ AC_CHECK_DECL(dbopen,,,[ | 22 | @@ -3229,8 +3229,16 @@ AC_CHECK_DECL(dbopen,,,[ |
23 | #include <db.h> | 23 | #include <db.h> |
24 | #endif]) | 24 | #endif]) |
25 | 25 | ||
@@ -38,6 +38,3 @@ index 962a748..42e6a93 100644 | |||
38 | if test "x$ac_cv_dbopen_libdb" = "xyes"; then | 38 | if test "x$ac_cv_dbopen_libdb" = "xyes"; then |
39 | LIB_DB="-ldb" | 39 | LIB_DB="-ldb" |
40 | fi | 40 | fi |
41 | -- | ||
42 | 1.7.4.1 | ||
43 | |||