From c8b7aad133c3e3319345d50f85a91cbd5116f842 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 12 Feb 2015 14:50:11 +0000 Subject: autotools/siteinfo: Avoid races over siteinfo files If a siteinfo enabled tasks re-executes at the wrong moment whilst something else is in do_configure, the _config files can be removed which upsets autoconf and causes build failures. Use the same approach as we do for dealing with the aclocal files. We already parse the manifests so look out any *_config files and if so, copy them, then reference the copy from siteinfo instead. This has the advantage of also being more deterministic. [YOCTO #7101] Signed-off-by: Richard Purdie --- meta/classes/autotools.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/classes/autotools.bbclass') diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 402ee1bf01..046e83dc9b 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -27,7 +27,7 @@ inherit siteinfo # Space separated list of shell scripts with variables defined to supply test # results for autoconf tests we cannot run at build time. -export CONFIG_SITE = "${@siteinfo_get_files(d)}" +export CONFIG_SITE = "${@siteinfo_get_files(d, False)}" acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" @@ -187,6 +187,7 @@ python autotools_copy_aclocals () { #bb.warn(str(configuredeps2)) cp = [] + siteconf = [] for c in configuredeps: if c.endswith("-native"): manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) @@ -201,6 +202,8 @@ python autotools_copy_aclocals () { for l in f: if "/aclocal/" in l and l.strip().endswith(".m4"): cp.append(l.strip()) + elif "config_site.d/" in l: + cp.append(l.strip()) except: bb.warn("%s not found" % manifest) @@ -208,6 +211,8 @@ python autotools_copy_aclocals () { t = os.path.join(aclocaldir, os.path.basename(c)) if not os.path.exists(t): os.symlink(c, t) + + d.setVar("CONFIG_SITE", siteinfo_get_files(d, False)) } autotools_copy_aclocals[vardepsexclude] += "MACHINE SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA" -- cgit 1.2.3-korg