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
This commit is contained in:
Richard Purdie
2007-05-28 22:50:06 +00:00
parent 80fbf41494
commit 01bb4a6cfe
8 changed files with 39 additions and 23 deletions

View File

@@ -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']]}"

View File

@@ -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']]}"

View File

@@ -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']]}"

View File

@@ -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']]}"

View File

@@ -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"

View File

@@ -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"
PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
GLIBCTARGETOS = "linux"
UCLIBCTARGETOS = "linux-uclibc"

View File

@@ -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 = ""

View File

@@ -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"