summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt/quilt
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-02-01 15:37:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 14:55:18 +0000
commitbc31351f6989372c7feb403f23532afd1f510fb1 (patch)
tree3b07cac7566db889b7af6a4b754a9dd934b6605e /meta/recipes-devtools/quilt/quilt
parentd6f4d682c0d51e13418ea3ab2ad75793c5e00324 (diff)
downloadpoky-bc31351f6989372c7feb403f23532afd1f510fb1.tar.gz
quilt: fix patch version detection
Fixes [BUGID #690] Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt/patch-version-detection.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
new file mode 100644
index 0000000000..8b84f812b5
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
@@ -0,0 +1,29 @@
1From: Jean Delvare
2Subject: [Quilt-dev] [PACH] Fix patch version detection
3Date: Mon, 21 Jun 2010 13:49:50 +0200
4
5New versions of GNU patch present themselves as "GNU patch" instead
6of just "patch".
7---
8 configure.ac | 6 +++++-
9 1 file changed, 5 insertions(+), 1 deletion(-)
10
11--- a/configure.ac
12+++ b/configure.ac
13@@ -262,7 +262,11 @@ fi
14 AC_MSG_CHECKING([the version of $PATCH])
15 if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
16 set -- `$PATCH --version 2> /dev/null`
17- patch_version=$2
18+ if test x$1 = xGNU ; then
19+ patch_version=$3
20+ else
21+ patch_version=$2
22+ fi
23 AC_MSG_RESULT($patch_version)
24 saved_IFS=$IFS; IFS='.'
25 set -- $patch_version
26
27--
28Jean Delvare
29Suse L3