summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-04-13 17:22:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-28 10:44:20 +0100
commit07a6bec75c59fec06d0947ada708482900bf067a (patch)
treefe8ecf6a82a4b9ee81b4cea8cf80dae4dae666d1 /meta/recipes-devtools/quilt
parent181d5f550d06aaf76ba20666664895355ba6ccea (diff)
downloadpoky-07a6bec75c59fec06d0947ada708482900bf067a.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch26
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.48.bb6
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
new file mode 100644
index 0000000000..672155bb65
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Pending
2
3the test should be skipped for cross compiling.
4
5Signed-off-by: Qing He <qing.he@intel.com>
6
7diff --git a/configure.ac b/configure.ac
8index 026a36c..8af591b 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -245,6 +245,7 @@ fi
12 QUILT_COMPAT_PROG_PATH(DIFF, diff)
13 QUILT_COMPAT_PROG_PATH(PATCH, patch)
14
15+if test "x$cross_compiling" != "xyes"; then
16 # Sun diff and others will not work because GNU patch options are used.
17 AC_MSG_CHECKING([the version of $DIFF])
18 if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
19@@ -293,6 +294,7 @@ current version of patch from ftp.gnu.org, or if you already have GNU patch
20 then you can supply its path with the '--with-patch=' option.
21 ])
22 fi
23+fi
24
25 QUILT_COMPAT_PROG_PATH(FIND, find)
26
diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb
index 20a708d891..124e2cdbbd 100644
--- a/meta/recipes-devtools/quilt/quilt_0.48.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.48.bb
@@ -2,8 +2,10 @@ require quilt.inc
2LICENSE="GPLv2" 2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" 4RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
5PR = "r0" 5PR = "r1"
6SRC_URI += "file://aclocal.patch" 6SRC_URI += "file://aclocal.patch \
7 file://gnu_patch_test_fix_target.patch \
8 "
7 9
8SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" 10SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
9SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" 11SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"