diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 17:34:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 17:34:59 +0000 |
| commit | ec740ac770d2124cbae1ab936d85b8343076c53b (patch) | |
| tree | 1587078f9d4822ec3e7d4ff21515fca43d8ccfbd /meta/recipes-devtools/quilt/quilt | |
| parent | f33d78ffef9d4b841dd734ca44b0c6c54e097bb8 (diff) | |
| download | openembedded-core-contrib-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.patch | 29 |
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 @@ -From: Jean Delvare -Subject: [Quilt-dev] [PACH] Fix patch version detection -Date: Mon, 21 Jun 2010 13:49:50 +0200 - -New versions of GNU patch present themselves as "GNU patch" instead -of just "patch". ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -262,7 +262,11 @@ fi - AC_MSG_CHECKING([the version of $PATCH]) - if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then - set -- `$PATCH --version 2> /dev/null` -- patch_version=$2 -+ if test x$1 = xGNU ; then -+ patch_version=$3 -+ else -+ patch_version=$2 -+ fi - AC_MSG_RESULT($patch_version) - saved_IFS=$IFS; IFS='.' - set -- $patch_version - --- -Jean Delvare -Suse L3 |