From b36930096d737245d25de87a79988db63bd99545 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 9 Mar 2011 17:57:26 -0800 Subject: 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. (From OE-Core rev: 2a15188d631a97dc20940f7edc801212e191332f) Signed-off-by: Richard Purdie --- meta/classes/autotools.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/autotools.bbclass') 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" -- cgit v1.2.3-54-g00ecf