diff options
| author | Qing He <qing.he@intel.com> | 2011-04-13 17:22:49 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-04-26 23:51:24 -0700 |
| commit | fd2485ab15ed82cb3dc84b8408e516a932de1bd1 (patch) | |
| tree | d8f10ab3cda45f13a01bc12a0b4bf928ecc52594 | |
| parent | bd0798120559a8aca726db8e962bbbafb80c2a54 (diff) | |
| download | openembedded-core-fd2485ab15ed82cb3dc84b8408e516a932de1bd1.tar.gz openembedded-core-fd2485ab15ed82cb3dc84b8408e516a932de1bd1.tar.bz2 openembedded-core-fd2485ab15ed82cb3dc84b8408e516a932de1bd1.zip | |
quilt: fix test for target build
fixes [YOCTO #969]
Signed-off-by: Qing He <qing.he@intel.com>
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.48.bb | 6 |
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 @@ +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) + 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 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" |