diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-03 16:06:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-03 17:46:46 +0100 |
commit | 23774530c1c2df8c306807d20baaea693250ef16 (patch) | |
tree | f7e4652b78437c6e67a13f9e4b3be4c33d803357 | |
parent | e8e06a48b34882bdd80aa94ff1d5ff329b7505dc (diff) | |
download | ast2050-yocto-poky-23774530c1c2df8c306807d20baaea693250ef16.zip ast2050-yocto-poky-23774530c1c2df8c306807d20baaea693250ef16.tar.gz |
autotools.bbclass: Fix m4 file race
If something removes .m4 files from the aclocal directory whilst aclocal is
running it gets upset. To avoid this we need to take a copy of the aclocal
directory and build against this instead.
[YOCTO #861]
(From OE-Core rev: 6a4778e21341f031569f561e7699d2c616b60af0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/autotools.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index e5c13ae..8f65b70 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -111,8 +111,13 @@ autotools_do_configure() { if [ -d ${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV ]; then acpaths="$acpaths -I${STAGING_DATADIR_NATIVE}/aclocal-$AUTOV" fi + # The aclocal directory could get modified by other processes + # uninstalling data from the sysroot. See Yocto #861 for details. + # We avoid this by taking a copy here and then files cannot disappear. if [ -d ${STAGING_DATADIR}/aclocal ]; then - acpaths="$acpaths -I ${STAGING_DATADIR}/aclocal" + mkdir -p ${B}/aclocal-copy/ + cp ${STAGING_DATADIR}/aclocal/* ${B}/aclocal-copy/ + acpaths="$acpaths -I ${B}/aclocal-copy/" fi # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # like it was auto-generated. Work around this by blowing it away |