aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-08-03 08:54:58 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-13 23:37:31 +0100
commit675259c82c118df9ff23456ba1475bb56225e59a (patch)
treeabb58c8afb28f929035bd3499d5ad63c841f2e59 /meta/conf
parent512d3b713c4eaa492909bd98ffaa707c50e03e02 (diff)
downloadopenembedded-core-contrib-675259c82c118df9ff23456ba1475bb56225e59a.tar.gz
sdk-task: make libc dependancies generic
This change specifies the libc dependancies in a generic fashion. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/poky-default.inc2
-rw-r--r--meta/conf/distro/include/poky-eabi-csl2005q3-2.inc2
-rw-r--r--meta/conf/distro/include/poky-eglibc.inc17
-rw-r--r--meta/conf/distro/include/poky-glibc.inc14
-rw-r--r--meta/conf/distro/include/poky-uclibc.inc7
5 files changed, 40 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index c66a0833bb..3e493f7a2d 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -4,7 +4,7 @@
TARGET_VENDOR = "-poky"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = ${POKYLIBC}
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
diff --git a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
index ab2de828f8..2b49670467 100644
--- a/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
+++ b/meta/conf/distro/include/poky-eabi-csl2005q3-2.inc
@@ -2,7 +2,7 @@
# Poky configuration to use CSL 2005q3-2 derived toolchain (ARM EABI)
#
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}-intermediate"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/poky-eglibc.inc
index 57d6d28289..7b6acfd9f5 100644
--- a/meta/conf/distro/include/poky-eglibc.inc
+++ b/meta/conf/distro/include/poky-eglibc.inc
@@ -27,3 +27,20 @@ OLDEST_KERNEL_linux-gnueabi ?= "2.6.16"
OLDEST_KERNEL_sparc64 ?= "2.4.21"
OLDEST_KERNEL_ppc64 ?= "2.4.21"
+LIBC_DEPENDENCIES = "\
+ libsegfault \
+ eglibc \
+ eglibc-dbg \
+ eglibc-dev \
+ eglibc-utils \
+ eglibc-thread-db \
+ eglibc-localedata-i18n \
+ eglibc-gconv-ibm850 \
+ eglibc-gconv-cp1252 \
+ eglibc-gconv-iso8859-1 \
+ eglibc-gconv-iso8859-15 \
+ eglibc-binary-localedata-en.gb \
+ locale-base-en-gb \
+ "
+
+
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc
index b76879e9e5..79abacf543 100644
--- a/meta/conf/distro/include/poky-glibc.inc
+++ b/meta/conf/distro/include/poky-glibc.inc
@@ -10,3 +10,17 @@ TARGET_OS = "${GLIBCTARGETOS}"
CXXFLAGS += "-fvisibility-inlines-hidden"
+LIBC_DEPENDENCIES = "\
+ libsegfault \
+ glibc \
+ glibc-dbg \
+ glibc-dev \
+ glibc-utils \
+ glibc-thread-db \
+ glibc-localedata-i18n \
+ glibc-gconv-ibm850 \
+ glibc-gconv-cp1252 \
+ glibc-gconv-iso8859-1 \
+ glibc-gconv-iso8859-15 \
+ locale-base-en-gb \
+ "
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc
index 72e016af6f..edbcc4aa6d 100644
--- a/meta/conf/distro/include/poky-uclibc.inc
+++ b/meta/conf/distro/include/poky-uclibc.inc
@@ -18,3 +18,10 @@ IMAGE_LINGUAS = ""
DEPLOY_DIR = "${TMPDIR}/deploy-uclibc"
DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
+
+LIBC_DEPENDENCIES = "\
+ uclibc \
+ uclibc-dbg \
+ uclibc-dev \
+ uclibc-thread-db \
+ "