summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-03-19 18:08:35 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-19 18:08:35 +0000
commita30f6e968c766abfc3e85c51b739f6509276e74b (patch)
tree843582ee88e85c0536ee151a53785ad26e86c79a
parent8d5f122cbb55105de85394969ab5b44c9d888e69 (diff)
downloadopenembedded-core-a30f6e968c766abfc3e85c51b739f6509276e74b.tar.gz
openembedded-core-a30f6e968c766abfc3e85c51b739f6509276e74b.tar.bz2
openembedded-core-a30f6e968c766abfc3e85c51b739f6509276e74b.tar.xz
openembedded-core-a30f6e968c766abfc3e85c51b739f6509276e74b.zip
base.bbclass: Don't inherit siteinfo in base.bbclass [based on an OE patch from Chris Larson]
-rw-r--r--meta/classes/autotools.bbclass6
-rw-r--r--meta/classes/siteinfo.bbclass8
-rw-r--r--meta/conf/machine/include/tune-xscale.inc2
-rw-r--r--meta/packages/openssl/openssl.inc2
-rw-r--r--meta/packages/perl/perl_5.8.8.bb2
5 files changed, 11 insertions, 9 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 4f56b33c2..3853268a7 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 7b012b7ba..8b7d3dfcf 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:
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 134758621..4f96814a7 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -1,5 +1,7 @@
FEED_ARCH = "armv5te"
+INHERIT += "siteinfo"
+
TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
diff --git a/meta/packages/openssl/openssl.inc b/meta/packages/openssl/openssl.inc
index fd0bbba58..5663e1cf9 100644
--- a/meta/packages/openssl/openssl.inc
+++ b/meta/packages/openssl/openssl.inc
@@ -20,7 +20,7 @@ export AS = "${CC} -c"
PARALLEL_MAKE = ""
-inherit pkgconfig
+inherit pkgconfig siteinfo
PACKAGES =+ "libcrypto libssl"
FILES_libcrypto = "${libdir}/libcrypto.so.*"
diff --git a/meta/packages/perl/perl_5.8.8.bb b/meta/packages/perl/perl_5.8.8.bb
index 6d7664ed7..1537a46b5 100644
--- a/meta/packages/perl/perl_5.8.8.bb
+++ b/meta/packages/perl/perl_5.8.8.bb
@@ -38,6 +38,8 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://config.sh-64-le \
file://config.sh-64-be"
+inherit siteinfo
+
# Where to find the native perl
HOSTPERL = "${STAGING_BINDIR_NATIVE}/perl${PV}"