conf: Add POKYLIBC to poky to select libc implemention

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1801 311d38ba-8fff-0310-9ca6-ca027cbcb966

8 files changed, 39 insertions, 23 deletions

diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index bb8371803..e3c7f9063 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -16,6 +16,5 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 PREFERRED_VERSION_glibc-initial ?= "2.5"
 PREFERRED_VERSION_elfutils ?= "0.108"
 
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
diff --git a/meta/conf/distro/include/poky-eabi2.inc b/meta/conf/distro/include/poky-eabi2.inc
index 51c6781d1..c3094bb7f 100644
--- a/meta/conf/distro/include/poky-eabi2.inc
+++ b/meta/conf/distro/include/poky-eabi2.inc
@@ -15,6 +15,5 @@ PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 PREFERRED_VERSION_elfutils ?= "0.108"
 
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
diff --git a/meta/conf/distro/include/poky-eabi3.inc b/meta/conf/distro/include/poky-eabi3.inc
index 263647920..128d53e39 100644
--- a/meta/conf/distro/include/poky-eabi3.inc
+++ b/meta/conf/distro/include/poky-eabi3.inc
@@ -15,6 +15,5 @@ PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 PREFERRED_VERSION_elfutils ?= "0.108"
 
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
diff --git a/meta/conf/distro/include/poky-eabi5.inc b/meta/conf/distro/include/poky-eabi5.inc
index 85a68e7de..74972ad82 100644
--- a/meta/conf/distro/include/poky-eabi5.inc
+++ b/meta/conf/distro/include/poky-eabi5.inc
@@ -8,9 +8,6 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
 PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3"
 PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3"
-#PREFERRED_VERSION_gcc ?= "4.1.0"
-#PREFERRED_VERSION_gcc-cross ?= "4.1.0"
-#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
 PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
 PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
@@ -18,6 +15,5 @@ PREFERRED_VERSION_glibc ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.4"
 PREFERRED_VERSION_elfutils ?= "0.108"
 
-#Use the ARM EABI when building for an ARM cpu. We can't use overrides
-#here because this breaks all places where ":=" is used.
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc
new file mode 100644
index 000000000..2744588e1
--- /dev/null
+++ b/meta/conf/distro/include/poky-glibc.inc
@@ -0,0 +1,9 @@
+# glibc:
+PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
+PREFERRED_PROVIDER_virtual/libc ?= "glibc"
+
+TARGET_OS = "${GLIBCTARGETOS}"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
diff --git a/meta/conf/distro/include/poky-oabi.inc b/meta/conf/distro/include/poky-oabi.inc
index 71d609201..2244e449c 100644
--- a/meta/conf/distro/include/poky-oabi.inc
+++ b/meta/conf/distro/include/poky-oabi.inc
@@ -8,4 +8,7 @@ PREFERRED_VERSION_gcc-cross ?= "3.4.4"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
 PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
\ No newline at end of file
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
+
+GLIBCTARGETOS = "linux"
+UCLIBCTARGETOS = "linux-uclibc"
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc
new file mode 100644
index 000000000..55a8694ae
--- /dev/null
+++ b/meta/conf/distro/include/poky-uclibc.inc
@@ -0,0 +1,14 @@
+# uclibc:
+#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
+PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
+PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+
+USE_NLS ?= "no"
+USE_NLS_glib-2.0 = "yes"
+
+TARGET_OS = "${UCLIBCTARGETOS}"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
+IMAGE_LINGUAS = ""
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 03c6c9b7d..f8e03505f 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -35,9 +35,11 @@ KERNEL_CONSOLE = "ttyS0"
 #INHIBIT_PACKAGE_STRIP = "1"
 
 POKYMODE ?= "eabi"
-
 require conf/distro/include/poky-${POKYMODE}.inc
 
+POKYLIBC ?= "glibc"
+require conf/distro/include/poky-${POKYLIBC}.inc
+
 #
 # Preferred providers:
 #
@@ -46,11 +48,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-# Libc/uclibc:
-#fix some iconv issues, needs to be adjusted when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-
 # Virtuals:
 PREFERRED_PROVIDER_virtual/db ?= "db"
 PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
@@ -186,7 +183,7 @@ PCMCIA_MANAGER ?= "pcmciautils"
 
 CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
 
-IMAGE_LINGUAS = "en-gb"
+IMAGE_LINGUAS ?= "en-gb"
 
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"