summaryrefslogtreecommitdiff
path: root/meta
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:05:53 -0800
commit2a15188d631a97dc20940f7edc801212e191332f (patch)
treeebb6aab2226a79f90c42fcf5cb64caca7f99423b /meta
parent2e9e8af197671ae06de1bdc9201765b160869d60 (diff)
downloadopenembedded-core-2a15188d631a97dc20940f7edc801212e191332f.tar.gz
openembedded-core-2a15188d631a97dc20940f7edc801212e191332f.tar.bz2
openembedded-core-2a15188d631a97dc20940f7edc801212e191332f.tar.xz
openembedded-core-2a15188d631a97dc20940f7edc801212e191332f.zip
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>
Diffstat (limited to 'meta')
-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 d43ae6d88..bc891f94e 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"