quilt: fix test for target build

fixes [YOCTO #969]

(From OE-Core rev: fd2485ab15ed82cb3dc84b8408e516a932de1bd1)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Qing He 2011-04-13 17:22:49 +08:00 committed by Richard Purdie
parent 181d5f550d
commit 07a6bec75c
2 changed files with 30 additions and 2 deletions

View File

@ -0,0 +1,26 @@
Upstream-Status: Pending
the test should be skipped for cross compiling.
Signed-off-by: Qing He <qing.he@intel.com>
diff --git a/configure.ac b/configure.ac
index 026a36c..8af591b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,7 @@ fi
QUILT_COMPAT_PROG_PATH(DIFF, diff)
QUILT_COMPAT_PROG_PATH(PATCH, patch)
+if test "x$cross_compiling" != "xyes"; then
# Sun diff and others will not work because GNU patch options are used.
AC_MSG_CHECKING([the version of $DIFF])
if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
@@ -293,6 +294,7 @@ current version of patch from ftp.gnu.org, or if you already have GNU patch
then you can supply its path with the '--with-patch=' option.
])
fi
+fi
QUILT_COMPAT_PROG_PATH(FIND, find)

View File

@ -2,8 +2,10 @@ require quilt.inc
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
PR = "r0"
SRC_URI += "file://aclocal.patch"
PR = "r1"
SRC_URI += "file://aclocal.patch \
file://gnu_patch_test_fix_target.patch \
"
SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"