[oe-commits] Chris Larson : autotools.bbclass: Kill acpath mangling & configure and aclocal.m4 removal.

[GIT User account]

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

Author: Chris Larson <clarson at mvista.com>
Date:   Wed Apr  1 16:45:08 2009 -0700

autotools.bbclass: Kill acpath mangling & configure and aclocal.m4 removal.

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

---

 classes/autotools.bbclass      |   32 ++------------------------------
 classes/autotools_base.bbclass |    1 +
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 2bcedf4..03cb782 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -23,7 +23,6 @@ def autotools_dep_prepend(d):
 	return deps
 
 DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
-acpaths = "default"
 EXTRA_AUTORECONF = "--exclude=autopoint"
 
 autotools_do_configure() {
@@ -33,33 +32,13 @@ autotools_do_configure() {
 	automake*)
 	;;
 	*)
-		# WARNING: gross hack follows:
-		# An autotools built package generally needs these scripts, however only
-		# automake or libtoolize actually install the current versions of them.
-		# This is a problem in builds that do not use libtool or automake, in the case
-		# where we -need- the latest version of these scripts.  e.g. running a build
-		# for a package whose autotools are old, on an x86_64 machine, which the old
-		# config.sub does not support.  Work around this by installing them manually
-		# regardless.
-		( for ac in `find ${S} -name configure.in -o -name configure.ac`; do
-			rm -f `dirname $ac`/configure
-			done )
 		if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
 			olddir=`pwd`
 			cd ${S}
-			if [ x"${acpaths}" = xdefault ]; then
-				acpaths=
-				for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
-					grep -v 'acinclude.m4' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
-					acpaths="$acpaths -I $i"
-				done
-			else
-				acpaths="${acpaths}"
-			fi
-			AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
+			AUTOV=`automake --version |head -n 1 |sed "s/.* //"`
 			install -d ${STAGING_DATADIR}/aclocal
 			install -d ${STAGING_DATADIR}/aclocal-$AUTOV
-			acpaths="$acpaths -I ${STAGING_DATADIR_NATIVE}/autoconf -I ${STAGING_DATADIR_NATIVE}/aclocal -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
@@ -75,13 +54,6 @@ autotools_do_configure() {
 				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.
-			if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then
-				rm -f aclocal.m4
-			fi
-
 			subdirs="`autoconf -t AC_CONFIG_SUBDIRS|cut -d: -f4`"
 			for dir in $subdirs .; do
 				if [ ! -e "${S}/$dir" ]; then
diff --git a/classes/autotools_base.bbclass b/classes/autotools_base.bbclass
index aff85b9..1f0ed1d 100644
--- a/classes/autotools_base.bbclass
+++ b/classes/autotools_base.bbclass
@@ -52,6 +52,7 @@ gnu_configize_here() {
 		if [ ! -e ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ]; then
 			oefatal "gnu-config data files missing"
 		fi
+		oenote Updating config.sub and config.guess in $macrodir
 		rm -f $macrodir/config.sub $macrodir/config.guess
 		cp -f ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub $macrodir/config.sub
 		cp -f ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess $macrodir/config.guess