aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Callaghan <dan.callaghan@opengear.com>2019-08-05 11:13:53 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-06 14:56:05 +0100
commite60c170b451a4aa561d08bfce97dca05508c2106 (patch)
tree5d177e8c4ae791b900e56a0427891949bbea6ae8
parentfb7f9becfdd7a7657b69e7bde472f3b8569eff63 (diff)
downloadopenembedded-core-contrib-e60c170b451a4aa561d08bfce97dca05508c2106.tar.gz
openembedded-core-contrib-e60c170b451a4aa561d08bfce97dca05508c2106.tar.bz2
openembedded-core-contrib-e60c170b451a4aa561d08bfce97dca05508c2106.zip
autotools: always include config_site.d files in CONFIG_SITE
Fixes: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13375 Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/autotools.bbclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 8768a6ad68..3d22ad0255 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -25,7 +25,9 @@ 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)}"
+# The value of this variable is filled in in a prefunc because it depends on
+# the contents of the sysroot.
+export CONFIG_SITE
acpaths ?= "default"
EXTRA_AUTORECONF = "--exclude=autopoint"
@@ -132,6 +134,8 @@ EXTRACONFFUNCS ??= ""
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}"
+do_compile[prefuncs] += "autotools_aclocals"
+do_install[prefuncs] += "autotools_aclocals"
do_configure[postfuncs] += "autotools_postconfigure"
ACLOCALDIR = "${STAGING_DATADIR}/aclocal"
@@ -140,7 +144,6 @@ ACLOCALEXTRAPATH_class-target = " -I ${STAGING_DATADIR_NATIVE}/aclocal/"
ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/"
python autotools_aclocals () {
- # Refresh variable with cache files
d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True))
}