summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 e5e0a4feca..77d1bcf55e 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -5,7 +5,8 @@ LICENSE = "GPLv2"
5LIC_CHKSUM_FILES = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_CHKSUM_FILES = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ 7SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
8 file://install.patch" 8 file://install.patch \
9 file://gnu_patch_test_fix.patch"
9 10
10inherit autotools 11inherit autotools
11 12
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 0000000000..cc4236b308
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch
@@ -0,0 +1,19 @@
1# quilt's configure tosses an error with patch @ GNU patch 2.6.1.81-5b68
2#
3# Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
4--- quilt-0.48/configure 2010-11-03 11:50:55.280329802 -0700
5+++ quilt-0.48/configure 2010-11-03 11:52:43.705354080 -0700
6@@ -5896,7 +5896,12 @@
7 echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; }
8 if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
9 set -- `$PATCH --version 2> /dev/null`
10- patch_version=$2
11+ #
12+ if test x$1 = xGNU ; then
13+ patch_version=$3
14+ else
15+ patch_version=$2
16+ fi
17 { echo "$as_me:$LINENO: result: $patch_version" >&5
18 echo "${ECHO_T}$patch_version" >&6; }
19 saved_IFS=$IFS; IFS='.'