From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 10 Mar 2011 01:57:26 +0000 (-0800)
Subject: autotools.bbclass: Fix automake file race issues
X-Git-Tag: 2011-1~2112
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2a15188d631a97dc20940f7edc801212e191332f;p=openembedded-core.git

autotools.bbclass: Fix automake file race issues

If one package is configuring when automake is built, the aclocal-VERSION
directory can be created or removed and this can confuse the configure
process.

Since we always run automake-native, it should always be using the
autoake-native aclocal directory for automake files which is the
result of this patch.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index d43ae6d88b..bc891f94e7 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -109,8 +109,8 @@ autotools_do_configure() {
 			AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
 			automake --version
 			echo "AUTOV is $AUTOV"
-			if [ -d ${STAGING_DATADIR}/aclocal-$AUTOV ]; then
-				acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV"
+			if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then
+				acpaths="$acpaths -I${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV"
 			fi
 			if [ -d ${STAGING_DATADIR}/aclocal ]; then
 				acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal"