Skip to contentSkip to conversation

fix bug 690: quilt-native build failure on opensuse 11.3

PATCH Applied Qing He 2 participants 3 messages Feb 1, 2011

lore
Share & tools
lore

Qing He

author
#0 lore raw

cover fix bug 690: quilt-native build failure on opensuse 11.3

From: Qing He <[email protected]>

The new patch version on OpenSuSE 11.3 causes the configure script to fail.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He <[email protected]>
---

Qing He (1):
quilt: fix patch version detection

 meta/recipes-devtools/quilt/quilt-native_0.48.bb   |    2 +-
 meta/recipes-devtools/quilt/quilt.inc              |    3 +-
 .../quilt/quilt/patch-version-detection.patch      |   29 ++++++++++++++++++++
 meta/recipes-devtools/quilt/quilt_0.48.bb          |    2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
author
#1 lore raw

PATCH 1/1 quilt: fix patch version detection

From: Qing He <[email protected]>

Fixes [BUGID #690]

Signed-off-by Qing He <[email protected]>
---
 meta/recipes-devtools/quilt/quilt-native_0.48.bb   |    2 +-
 meta/recipes-devtools/quilt/quilt.inc              |    3 +-
 .../quilt/quilt/patch-version-detection.patch      |   29 ++++++++++++++++++++
 meta/recipes-devtools/quilt/quilt_0.48.bb          |    2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
meta/recipes-devtools/quilt/quilt-native_0.48.bb +1 -1
index a62531e..3cfe395 100644
@@ -1,7 +1,7 @@
 require quilt.inc
 require quilt-native.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
meta/recipes-devtools/quilt/quilt.inc +2 -1
index 4542511..e2cfce4 100644
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
         file://install.patch \
-        file://gnu_patch_test_fix.patch"
+        file://gnu_patch_test_fix.patch \
+        file://patch-version-detection.patch"
 
 inherit autotools
meta/recipes-devtools/quilt/quilt/patch-version-detection.patch new file +29 -0
new file mode 100644
index 0000000..878a953
@@ -0,0 +1,29 @@
+From: Jean Delvare
+Subject: [Quilt-dev] [PACH] Fix patch version detection</td>
+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
meta/recipes-devtools/quilt/quilt_0.48.bb +1 -1
index a2a8a5c..6f5e2bc 100644
@@ -2,7 +2,7 @@ require quilt.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r0"
+PR = "r1"
 SRC_URI += "file://aclocal.patch"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
Signature · 1 line
1.7.0
Applied
#2 lore raw

Re: [PATCH 1/1] quilt: fix patch version detection

Quoted 3 lines · Qing He

From: Qing He <[email protected]>

Fixes [BUGID #690]

Merged to master, thanks.

Richard