diff options
Diffstat (limited to 'meta/classes/autotools.bbclass')
| -rw-r--r-- | meta/classes/autotools.bbclass | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 6b99bddd5d..bb129fb245 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" @@ -86,7 +86,7 @@ oe_runconf () { ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" if [ "$?" != "0" ]; then echo "Configure failed. The contents of all config.log files follows to aid debugging" - find ${S} -name config.log -print -exec cat {} \; + find ${S} -ignore_readdir_race -name config.log -print -exec cat {} \; bbfatal "oe_runconf failed" fi set -e @@ -109,7 +109,12 @@ autotools_preconfigure() { else # At least remove the .la files since automake won't automatically # regenerate them even if CFLAGS/LDFLAGS are different - cd ${S}; find ${S} -name \*.la -delete + cd ${S} + if [ "${CLEANBROKEN}" != "1" -a \( -e Makefile -o -e makefile -o -e GNUmakefile \) ]; then + echo "Running \"${MAKE} clean\" in ${S}" + ${MAKE} clean + fi + find ${S} -name \*.la -delete fi fi fi @@ -182,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) @@ -196,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) @@ -203,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" |