mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-19 05:50:05 +00:00
f2d6ae5110
WARNING: pidgin-2.12.0-r0 do_patch:
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:
Applying patch sanitize-configure.ac.patch
patching file configure.ac
Hunk #1 succeeded at 642 with fuzz 1 (offset 170 lines).
Hunk #2 succeeded at 2397 (offset 537 lines).
Hunk #3 succeeded at 2429 (offset 537 lines).
Now at patch sanitize-configure.ac.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From c3058f9eadaf5ff28ba776cfed54b609a93a1249 Mon Sep 17 00:00:00 2001
|
|
From: Herrie <github.com@herrie.org>
|
|
Date: Mon, 24 Jul 2017 21:30:16 +0200
|
|
|
|
---
|
|
configure.ac | 10 +---------
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index b8acd2a..d20a18e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -642,7 +642,7 @@ if test "x$enable_consoleui" = "xyes"; then
|
|
if test "x$enable_consoleui" = "xyes"; then
|
|
dnl # Some distros put the headers in ncursesw/, some don't
|
|
found_ncurses_h=no
|
|
- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
|
|
+ for location in $ac_ncurses_includes $NCURSES_HEADERS
|
|
do
|
|
f="$location/ncurses.h"
|
|
orig_CFLAGS="$CFLAGS"
|
|
@@ -2397,10 +2397,6 @@ if test "$kerberos" != "no" ; then
|
|
KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV"
|
|
fi
|
|
KRB4_LDFLAGS="-L${kerberos}/lib"
|
|
- elif test -d /usr/local/include/kerberosIV ; then
|
|
- KRB4_CFLAGS="-I/usr/local/include/kerberosIV"
|
|
- elif test -d /usr/include/kerberosIV ; then
|
|
- KRB4_CFLAGS="-I/usr/include/kerberosIV"
|
|
fi
|
|
AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
|
|
|
|
@@ -2433,10 +2429,6 @@ if test "$zephyr" != "no" ; then
|
|
ZEPHYR_LDFLAGS="-L${zephyr}/lib"
|
|
elif test -d /usr/athena/include/zephyr ; then
|
|
ZEPHYR_CFLAGS="-I/usr/athena/include"
|
|
- elif test -d /usr/include/zephyr ; then
|
|
- ZEPHYR_CFLAGS="-I/usr/include"
|
|
- elif test -d /usr/local/include/zephyr ; then
|
|
- ZEPHYR_CFLAGS="-I/usr/local/include"
|
|
fi
|
|
AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.])
|
|
AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
|