From 2e0fa4918d643ce6ec0299cd31cfe1c346e4bce3 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 27 Jul 2009 18:51:22 +0000 Subject: libtool: Fixed paths to grep and sed. --- recipes/libtool/libtool_2.2.4.bb | 12 +++++++++++- recipes/libtool/libtool_2.2.6a.bb | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/recipes/libtool/libtool_2.2.4.bb b/recipes/libtool/libtool_2.2.4.bb index f4b1ab824f..ad4b0a0c30 100644 --- a/recipes/libtool/libtool_2.2.4.bb +++ b/recipes/libtool/libtool_2.2.4.bb @@ -1,5 +1,5 @@ require libtool.inc -PR = "r15" +PR = "r16" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz" S = "${WORKDIR}/libtool-${PV}" @@ -14,6 +14,16 @@ inherit autotools EXTRA_AUTORECONF = "--exclude=libtoolize" +do_configure_prepend () { + # Skip this for native build: + if test -n "$CONFIG_SITE" ; then + export ac_cv_path_SED=${ac_cv_path_GREP=/bin/sed} + export ac_cv_path_GREP=${ac_cv_path_GREP=/bin/grep} + export ac_cv_path_EGREP=${ac_cv_path_EGREP=/bin/grep -E} + export ac_cv_path_FGREP=${ac_cv_path_FGREP=/bin/grep -F} + fi +} + do_stage () { install -d ${STAGING_INCDIR}/libltdl install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ diff --git a/recipes/libtool/libtool_2.2.6a.bb b/recipes/libtool/libtool_2.2.6a.bb index 9ecd7a0f3b..6268576da6 100644 --- a/recipes/libtool/libtool_2.2.6a.bb +++ b/recipes/libtool/libtool_2.2.6a.bb @@ -1,5 +1,5 @@ require libtool.inc -PR = "r0" +PR = "r1" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz" S = "${WORKDIR}/${BPN}-2.2.6" @@ -14,6 +14,16 @@ inherit autotools EXTRA_AUTORECONF = "--exclude=libtoolize" +do_configure_prepend () { + # Skip this for native build: + if test -n "$CONFIG_SITE" ; then + export ac_cv_path_SED=${ac_cv_path_GREP=/bin/sed} + export ac_cv_path_GREP=${ac_cv_path_GREP=/bin/grep} + export ac_cv_path_EGREP=${ac_cv_path_EGREP=/bin/grep -E} + export ac_cv_path_FGREP=${ac_cv_path_FGREP=/bin/grep -F} + fi +} + do_stage () { install -d ${STAGING_INCDIR}/libltdl install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ -- cgit v1.2.3