base.bbclass: Don't inherit siteinfo in base.bbclass [based on an OE patch from Chris Larson]

2 files changed, 6 insertions, 8 deletions

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 4f56b33c28..3853268a77 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -27,6 +27,12 @@ DEPENDS_prepend = "${@autotools_dep_prepend(d)}"
 DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}"
 DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}"
 
+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)}"
+
 acpaths = "default"
 EXTRA_AUTORECONF = "--exclude=autopoint"
 
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 7b012b7ba7..8b7d3dfcf6 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -100,14 +100,6 @@ def siteinfo_get_files(d):
        bb.debug(1, "SITE files " + sitefiles);
        return sitefiles
 
-#
-# Export CONFIG_SITE to the enviroment. The autotools will make use
-# of this to determine where to load in variables from. This is a
-# space seperate list of shell scripts processed in the order listed.
-#
-export CONFIG_SITE = "${@siteinfo_get_files(d)}"
-
-
 def siteinfo_get_endianess(d):
        info = get_siteinfo_list(d)
        if 'endian-little' in info: