summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt/quilt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 17:34:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 17:34:59 +0000
commitec740ac770d2124cbae1ab936d85b8343076c53b (patch)
tree1587078f9d4822ec3e7d4ff21515fca43d8ccfbd /meta/recipes-devtools/quilt/quilt
parentf33d78ffef9d4b841dd734ca44b0c6c54e097bb8 (diff)
downloadpoky-ec740ac770d2124cbae1ab936d85b8343076c53b.tar.gz
Revert "quilt: fix patch version detection"
This reverts commit bc31351f6989372c7feb403f23532afd1f510fb1. This change is already applied against configure, not configure.ac. This change forces a reautoconf of quilt-native before we've built autoconf and if "git-desc" isn't present it can result in further problems. The simplest solution is to revert this change.
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt/patch-version-detection.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
deleted file mode 100644
index 8b84f812b5..0000000000
--- a/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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