summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2010-11-03 17:20:00 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-10 21:22:26 +0800
commit32f241a51c800cfc5b146e990acee004d91bef32 (patch)
treef97694bec0dafad4cf17e4685c2923e45692bbc9 /meta
parent77cb80cc315a82be133c73d1bc769be0e6ff0d16 (diff)
downloadopenembedded-core-32f241a51c800cfc5b146e990acee004d91bef32.tar.gz
openembedded-core-32f241a51c800cfc5b146e990acee004d91bef32.tar.bz2
openembedded-core-32f241a51c800cfc5b146e990acee004d91bef32.tar.xz
openembedded-core-32f241a51c800cfc5b146e990acee004d91bef32.zip
quilt: Fixed configure test for patch --version.
OpenSuSE 11.3 uses GNU patch 2.6.1.81-5b68 which breaks quilt's configure test for patch version. Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc3
-rw-r--r--meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch19
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index e5e0a4fec..77d1bcf55 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -5,7 +5,8 @@ LICENSE = "GPLv2"
LIC_CHKSUM_FILES = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
- file://install.patch"
+ file://install.patch \
+ file://gnu_patch_test_fix.patch"
inherit autotools
diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch
new file mode 100644
index 000000000..cc4236b30
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch
@@ -0,0 +1,19 @@
+# quilt's configure tosses an error with patch @ GNU patch 2.6.1.81-5b68
+#
+# Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
+--- quilt-0.48/configure 2010-11-03 11:50:55.280329802 -0700
++++ quilt-0.48/configure 2010-11-03 11:52:43.705354080 -0700
+@@ -5896,7 +5896,12 @@
+ echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; }
+ 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
+ { echo "$as_me:$LINENO: result: $patch_version" >&5
+ echo "${ECHO_T}$patch_version" >&6; }
+ saved_IFS=$IFS; IFS='.'