CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

quilt: Fixed configure test for patch --version.

Browse Source 
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>
This commit is contained in:
Beth Flanagan 2010-11-03 17:20:00 -07:00 committed by Joshua Lock
parent 12a3d41a24
commit 01bc47f4d4
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-devtools/quilt/quilt.inc
View File

@ -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

19
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch Normal file
View File

@ -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='.'