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 d43ae6d88b4350d09819f0368c40fe318359b1cd..bc891f94e7517f3bf54e3d7e24a26c7d3df16ae0 100644 (file)
--- 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"