summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-03 09:29:36 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-03 09:29:36 +0100
commit3d7431b71b3308c917ba886d213277874c2610b0 (patch)
tree12c71990dff90abe8220efeb3af7f592e87541fc
parent7e80c6e446e18437d5a5953d459276b4f799513c (diff)
downloadpoky-3d7431b71b3308c917ba886d213277874c2610b0.tar.gz
eglibc: Set BBCLASSEXTEND to include nativesdk
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/conf/distro/include/poky-default.inc4
-rw-r--r--meta/conf/distro/include/poky-glibc.inc6
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
4 files changed, 12 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index bc1db89f3b..62d5273660 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -4,7 +4,7 @@
4 4
5TARGET_VENDOR = "-poky" 5TARGET_VENDOR = "-poky"
6 6
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = ${POKYLIBC} 7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" 9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" 10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
@@ -12,6 +12,8 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" 12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" 13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
14PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" 14PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial"
15PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk"
16
15 17
16GCCVERSION ?= "4.5.0" 18GCCVERSION ?= "4.5.0"
17GCCVERSION_powerpc ?= "4.3.3" 19GCCVERSION_powerpc ?= "4.3.3"
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc
index 5d300c6dfa..35c6fc1627 100644
--- a/meta/conf/distro/include/poky-glibc.inc
+++ b/meta/conf/distro/include/poky-glibc.inc
@@ -2,11 +2,17 @@
2# glibc specific configuration 2# glibc specific configuration
3# 3#
4 4
5#glibc
5PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" 6PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
6PREFERRED_PROVIDER_virtual/libintl ?= "glibc" 7PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
7PREFERRED_PROVIDER_virtual/libc ?= "glibc" 8PREFERRED_PROVIDER_virtual/libc ?= "glibc"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" 9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
9 10
11#glibc-nativesdk
12PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
13PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
14PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk"
15
10TARGET_OS = "${GLIBCTARGETOS}" 16TARGET_OS = "${GLIBCTARGETOS}"
11 17
12CXXFLAGS += "-fvisibility-inlines-hidden" 18CXXFLAGS += "-fvisibility-inlines-hidden"
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 8ee6bba067..01bda10dc1 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -28,7 +28,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
28# Set this to zero if you don't want ldconfig in the output package 28# Set this to zero if you don't want ldconfig in the output package
29USE_LDCONFIG ?= "1" 29USE_LDCONFIG ?= "1"
30 30
31PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-pic eglibc-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" 31PACKAGES = "${PN}-dbg ${PN} catchsegv sln nscd ldd localedef ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
32 32
33PACKAGES_DYNAMIC = " \ 33PACKAGES_DYNAMIC = " \
34 glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \ 34 glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index f1b84967b4..45e1520792 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -95,3 +95,5 @@ do_compile () {
95} 95}
96 96
97require eglibc-package.inc 97require eglibc-package.inc
98
99BBCLASSEXTEND = "nativesdk"