[oe-commits] Stanislav Brabec : quilt: Do not check host system when building non-native package.

[git version control]

Module: openembedded.git
Branch: testing-next
Commit: 2ebaf11c1532db275a46ab07472b93f7003caa99
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2ebaf11c1532db275a46ab07472b93f7003caa99

Author: Stanislav Brabec <utx at penguin.cz>
Date:   Thu Apr 21 22:23:36 2011 +0000

quilt: Do not check host system when building non-native package.

Signed-off-by: Stanislav Brabec <utx at penguin.cz>

---

 recipes/quilt/quilt-package.inc |   13 +++++++++++--
 recipes/quilt/quilt_0.48.bb     |    7 ++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/recipes/quilt/quilt-package.inc b/recipes/quilt/quilt-package.inc
index 1721049..7f4b3cb 100644
--- a/recipes/quilt/quilt-package.inc
+++ b/recipes/quilt/quilt-package.inc
@@ -1,11 +1,20 @@
-require quilt.inc 
+require quilt.inc
 
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+RDEPENDS_${PN} += "bash patch diffstat bzip2 util-linux"
 
 SRC_URI += "file://aclocal.patch"
 
 inherit autotools gettext
 
+EXTRA_OECONF = " \
+ac_cv_path_BASH=/bin/bash \
+ac_cv_path_DIFF=${bindir}/diff \
+ac_cv_path_DIFFSTAT=${bindir}/diffstat \
+ac_cv_path_FIND=${bindir}/find \
+ac_cv_path_PATCH=${bindir}/patch \
+ac_cv_path_PERL=${bindir}/perl \
+"
+
 do_install () {
 	oe_runmake 'BUILD_ROOT=${D}' install
 
diff --git a/recipes/quilt/quilt_0.48.bb b/recipes/quilt/quilt_0.48.bb
index 3a6fd4b..18e639e 100644
--- a/recipes/quilt/quilt_0.48.bb
+++ b/recipes/quilt/quilt_0.48.bb
@@ -1,6 +1,11 @@
 require quilt-package.inc
 
-PR="${INC_PR}"
+do_configure_prepend() {
+	# Ugly hack! These tests should be protected by AC_CACHE_CHECK, not deleted.
+	sed -i '/^\(AC_MSG_CHECKING.*\(whether\|version of\)\|if.*_version\)/,/^fi/d' configure.ac
+}
+
+PR="${INC_PR}.1"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"