6 files changed, 42 insertions, 32 deletions
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc
index c66a0833b..3e493f7a2 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 ab2de828f..2b4967046 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 57d6d2828..7b6acfd9f 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 b76879e9e..79abacf54 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 72e016af6..edbcc4aa6 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 \
+    "
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-target.bb b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
index 7b446eba7..4aa318881 100644
--- a/meta/packages/tasks/task-poky-standalone-sdk-target.bb
+++ b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Target packages for the standalone SDK"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -10,33 +10,5 @@ RDEPENDS_${PN} = "\
     libgcc-dev \
     libstdc++ \
     libstdc++-dev \
+    ${LIBC_DEPENDENCIES} \
     "
-
-GLIBC_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 \
-    "
-
-RDEPENDS_${PN}_append_linux = "${GLIBC_DEPENDENCIES}"
-RDEPENDS_${PN}_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
-
-UCLIBC_DEPENDENCIES = "\
-    uclibc \
-    uclibc-dbg \
-    uclibc-dev \
-    uclibc-thread-db \
-    "
-
-RDEPENDS_${PN}_append_linux-uclibc = "${UCLIBC_DEPENDENCIES}"
-RDEPENDS_${PN}_append_linux-uclibcgnueabi = "${UCLIBC_DEPENDENCIES}"
-