summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 16:05:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 16:05:18 +0100
commit4d62860da31c6aa97fb5debbd4c274a6098bcea4 (patch)
treecab9da8fc28f5b391e47c542bda3410cf8b93f64 /meta/conf
parentf10292ab3917549486cc676b2ff4f6cb4566b0db (diff)
downloadpoky-4d62860da31c6aa97fb5debbd4c274a6098bcea4.tar.gz
conf/distrosetup: Clean up default libc config and sync with OE-Core (artifact of merge issue)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc8
-rw-r--r--meta/conf/distro/include/tclibc-glibc.inc7
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc3
-rw-r--r--meta/conf/distro/include/tcmode-default.inc8
4 files changed, 7 insertions, 19 deletions
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index b65e58e007..a4c648e28e 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -10,17 +10,11 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
10# Add glibc overrides to the overrides for eglibc. 10# Add glibc overrides to the overrides for eglibc.
11OVERRIDES .= ":libc-glibc" 11OVERRIDES .= ":libc-glibc"
12 12
13#eglibc
14PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" 13PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
14PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
15PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" 15PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
16PREFERRED_PROVIDER_virtual/libc ?= "eglibc" 16PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
17PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial"
18PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc ?= "eglibc"
19
20#eglibc-nativesdk
21PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
22PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" 17PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk"
23PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk"
24 18
25CXXFLAGS += "-fvisibility-inlines-hidden" 19CXXFLAGS += "-fvisibility-inlines-hidden"
26 20
diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index 75934a034f..e5843b0692 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -10,16 +10,11 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
10# Add glibc to the overrides. 10# Add glibc to the overrides.
11OVERRIDES =. "libc-glibc:" 11OVERRIDES =. "libc-glibc:"
12 12
13#glibc
14PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" 13PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
14PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
15PREFERRED_PROVIDER_virtual/libintl ?= "glibc" 15PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
16PREFERRED_PROVIDER_virtual/libc ?= "glibc" 16PREFERRED_PROVIDER_virtual/libc ?= "glibc"
17PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
18
19#glibc-nativesdk
20PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
21PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk" 17PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
22PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk"
23 18
24CXXFLAGS += "-fvisibility-inlines-hidden" 19CXXFLAGS += "-fvisibility-inlines-hidden"
25 20
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index 9b1c2094ca..27f6ec672e 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -10,15 +10,12 @@ TARGET_OS_armeb = "linux-uclibceabi"
10OVERRIDES =. "libc-uclibc:" 10OVERRIDES =. "libc-uclibc:"
11 11
12PREFERRED_PROVIDER_virtual/libc = "uclibc" 12PREFERRED_PROVIDER_virtual/libc = "uclibc"
13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
14PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" 13PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
15PREFERRED_PROVIDER_virtual/libintl ?= "gettext" 14PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
16 15
17USE_NLS ?= "no" 16USE_NLS ?= "no"
18USE_NLS_glib-2.0 = "yes" 17USE_NLS_glib-2.0 = "yes"
19 18
20TARGET_OS = "${UCLIBCTARGETOS}"
21
22CXXFLAGS += "-fvisibility-inlines-hidden" 19CXXFLAGS += "-fvisibility-inlines-hidden"
23 20
24IMAGE_LINGUAS = "" 21IMAGE_LINGUAS = ""
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 666e61f0ea..584da9bbba 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -2,16 +2,18 @@
2# Default toolchain configuration 2# Default toolchain configuration
3# 3#
4 4
5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" 6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" 7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" 8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" 9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
11PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" 10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
12PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
13PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
14 11
12# Default libc config
13PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
14PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
15PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
16PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk"
15PREFERRED_PROVIDER_virtual/gettext ??= "gettext" 17PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
16 18
17GCCVERSION ?= "4.5.1" 19GCCVERSION ?= "4.5.1"