[oe-commits] Chris Larson : autotools.bbclass: first pass at pointing autotools at current staging via env vars.

[GIT User account]

Module: openembedded.git
Branch: kergoth/autotools
Commit: 3631765365fb9db48df5a2c936c8d46f79b5c283
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3631765365fb9db48df5a2c936c8d46f79b5c283

Author: Chris Larson <clarson at mvista.com>
Date:   Thu Mar 19 07:59:25 2009 -0700

autotools.bbclass: first pass at pointing autotools at current staging via env vars.

Just about every path of importance used by autoconf, automake, aclocal,
autoheader, autom4te can be set via a variable.  By forcing them to current staging, we can ensure autotools-native don't break if tmp moves.

Signed-off-by: Chris Larson <clarson at mvista.com>

---

 classes/autotools.bbclass |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 20f371a..2ffc671 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -102,7 +102,21 @@ autotools_do_configure() {
 			echo "AUTOV is $AUTOV"
 			install -d ${STAGING_DATADIR}/aclocal
 			install -d ${STAGING_DATADIR}/aclocal-$AUTOV
-			acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal"
+			acpaths="$acpaths -I ${STAGING_DATADIR_NATIVE}/autoconf -I ${STAGING_DATADIR_NATIVE}/aclocal -I ${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal"
+			if [ -x ${STAGING_DATADIR_NATIVE}/libtool ]; then
+				acpaths="$acpaths -I ${STAGING_DATADIR_NATIVE}/libtool"
+			fi
+			export AC_MACRODIR=${STAGING_DATADIR_NATIVE}/autoconf
+			export AUTOM4TE="${STAGING_BINDIR_NATIVE}/autom4te"
+			export ACLOCAL="AUTOM4TE=\"${STAGING_BINDIR_NATIVE}/autom4te -B ${STAGING_DATADIR_NATIVE}/autoconf\" aclocal --acdir ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV"
+			export AUTOCONF="${STAGING_BINDIR_NATIVE}/autoconf -I ${STAGING_DATADIR_NATIVE}/autoconf"
+			export AUTOMAKE="${STAGING_BINDIR_NATIVE}/automake --libdir=${STAGING_DATADIR_NATIVE}/automake-$AUTOV"
+			export AUTOHEADER="${STAGING_BINDIR_NATIVE}/autoheader"
+			export perllibdir="${STAGING_DATADIR_NATIVE}/automake-$AUTOV"
+			if [ -x ${STAGING_BINDIR_NATIVE}/m4 ]; then
+				export M4=${STAGING_BINDIR_NATIVE}/m4
+			fi
+
 			# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
 			# like it was auto-generated.  Work around this by blowing it away
 			# by hand, unless the package specifically asked not to run aclocal.