summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-09 17:57:26 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-10 18:14:28 -0800
commitb36930096d737245d25de87a79988db63bd99545 (patch)
treecb5297b411e5efdbeb6c4db5e74335290ed2828d
parentf776bc667eb99bf554f433d75a381ebbb1ddb618 (diff)
downloadpoky-b36930096d737245d25de87a79988db63bd99545.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/autotools.bbclass4
1 files changed, 2 insertions, 2 deletions
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() {
109 AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"` 109 AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"`
110 automake --version 110 automake --version
111 echo "AUTOV is $AUTOV" 111 echo "AUTOV is $AUTOV"
112 if [ -d ${STAGING_DATADIR}/aclocal-$AUTOV ]; then 112 if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then
113 acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV" 113 acpaths="$acpaths -I${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV"
114 fi 114 fi
115 if [ -d ${STAGING_DATADIR}/aclocal ]; then 115 if [ -d ${STAGING_DATADIR}/aclocal ]; then
116 acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal" 116 acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal"