From 561d875404ef1783f94f37314b6e756766db8411 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 5 Aug 2010 19:38:06 -0700 Subject: libc-package.bbclass: merge glibc & eglibc class files Other enhancements: print qemu's stdio & error on failure glibc: enable locale generation for all arches eglibc: enable binary locale generation for mips And cleanup of code based on the code review. [e]glibc: move common definition in the common file bitbake was complaining about duplicate definition of get_libc_fpu_setting in eglibc.inc & glibc.inc files. And bump PRs Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/conf/distro/include/poky-eglibc.inc | 12 ------------ meta/conf/distro/include/poky-glibc.inc | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'meta/conf/distro/include') diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/poky-eglibc.inc index 6c9dd0437c..c4e002b6e3 100644 --- a/meta/conf/distro/include/poky-eglibc.inc +++ b/meta/conf/distro/include/poky-eglibc.inc @@ -15,18 +15,6 @@ TARGET_OS = "${GLIBCTARGETOS}" CXXFLAGS += "-fvisibility-inlines-hidden" - -# eglibc is configured for OLDEST_KERNEL kernel version, so we set minimal -# sane versions there - -OLDEST_KERNEL ?= "2.4.0" - -# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi" -# TARGET_OS here, not on architecture which is 'arm' in both cases -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 \ diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc index 79abacf543..5d300c6dfa 100644 --- a/meta/conf/distro/include/poky-glibc.inc +++ b/meta/conf/distro/include/poky-glibc.inc @@ -5,6 +5,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" TARGET_OS = "${GLIBCTARGETOS}" -- cgit 1.2.3-korg