summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-28 22:50:06 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-28 22:50:06 +0000
commit01bb4a6cfe38a2df33e11d2d9b25f6837ec312ce (patch)
tree37160f918af3f056e5f1df88045e821728bf3f51
parent80fbf41494fe65ad27051ccc5e182dd6fcff8428 (diff)
downloadpoky-01bb4a6cfe38a2df33e11d2d9b25f6837ec312ce.tar.gz
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
-rw-r--r--meta/conf/distro/include/poky-eabi.inc5
-rw-r--r--meta/conf/distro/include/poky-eabi2.inc5
-rw-r--r--meta/conf/distro/include/poky-eabi3.inc5
-rw-r--r--meta/conf/distro/include/poky-eabi5.inc8
-rw-r--r--meta/conf/distro/include/poky-glibc.inc9
-rw-r--r--meta/conf/distro/include/poky-oabi.inc5
-rw-r--r--meta/conf/distro/include/poky-uclibc.inc14
-rw-r--r--meta/conf/distro/poky.conf11
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 bb83718031..e3c7f90639 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"
16PREFERRED_VERSION_glibc-initial ?= "2.5" 16PREFERRED_VERSION_glibc-initial ?= "2.5"
17PREFERRED_VERSION_elfutils ?= "0.108" 17PREFERRED_VERSION_elfutils ?= "0.108"
18 18
19#Use the ARM EABI when building for an ARM cpu. We can't use overrides 19GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
20#here because this breaks all places where ":=" is used. 20UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
21TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
diff --git a/meta/conf/distro/include/poky-eabi2.inc b/meta/conf/distro/include/poky-eabi2.inc
index 51c6781d17..c3094bb7f9 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"
15PREFERRED_VERSION_glibc-intermediate ?= "2.4" 15PREFERRED_VERSION_glibc-intermediate ?= "2.4"
16PREFERRED_VERSION_elfutils ?= "0.108" 16PREFERRED_VERSION_elfutils ?= "0.108"
17 17
18#Use the ARM EABI when building for an ARM cpu. We can't use overrides 18GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
19#here because this breaks all places where ":=" is used. 19UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
20TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
diff --git a/meta/conf/distro/include/poky-eabi3.inc b/meta/conf/distro/include/poky-eabi3.inc
index 263647920f..128d53e39e 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"
15PREFERRED_VERSION_glibc-intermediate ?= "2.4" 15PREFERRED_VERSION_glibc-intermediate ?= "2.4"
16PREFERRED_VERSION_elfutils ?= "0.108" 16PREFERRED_VERSION_elfutils ?= "0.108"
17 17
18#Use the ARM EABI when building for an ARM cpu. We can't use overrides 18GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
19#here because this breaks all places where ":=" is used. 19UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
20TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
diff --git a/meta/conf/distro/include/poky-eabi5.inc b/meta/conf/distro/include/poky-eabi5.inc
index 85a68e7de9..74972ad822 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"
8PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3" 8PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-2005q3"
9PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3" 9PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-2005q3"
10PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3" 10PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-2005q3"
11#PREFERRED_VERSION_gcc ?= "4.1.0"
12#PREFERRED_VERSION_gcc-cross ?= "4.1.0"
13#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0"
14PREFERRED_VERSION_binutils ?= "2.16.91.0.7" 11PREFERRED_VERSION_binutils ?= "2.16.91.0.7"
15PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" 12PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7"
16PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" 13PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
@@ -18,6 +15,5 @@ PREFERRED_VERSION_glibc ?= "2.4"
18PREFERRED_VERSION_glibc-intermediate ?= "2.4" 15PREFERRED_VERSION_glibc-intermediate ?= "2.4"
19PREFERRED_VERSION_elfutils ?= "0.108" 16PREFERRED_VERSION_elfutils ?= "0.108"
20 17
21#Use the ARM EABI when building for an ARM cpu. We can't use overrides 18GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
22#here because this breaks all places where ":=" is used. 19UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
23TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc
new file mode 100644
index 0000000000..2744588e17
--- /dev/null
+++ b/meta/conf/distro/include/poky-glibc.inc
@@ -0,0 +1,9 @@
1# glibc:
2PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
3PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
4PREFERRED_PROVIDER_virtual/libc ?= "glibc"
5
6TARGET_OS = "${GLIBCTARGETOS}"
7
8CXXFLAGS += "-fvisibility-inlines-hidden"
9
diff --git a/meta/conf/distro/include/poky-oabi.inc b/meta/conf/distro/include/poky-oabi.inc
index 71d6092011..2244e449c7 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"
8PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" 8PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
9PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" 9PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1"
10PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" 10PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
11PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" \ No newline at end of file 11PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc"
12
13GLIBCTARGETOS = "linux"
14UCLIBCTARGETOS = "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 0000000000..55a8694aeb
--- /dev/null
+++ b/meta/conf/distro/include/poky-uclibc.inc
@@ -0,0 +1,14 @@
1# uclibc:
2#fix some iconv issues, needs to be adjusted when doing uclibc builds
3PREFERRED_PROVIDER_virtual/libc = "uclibc"
4PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
5PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
6
7USE_NLS ?= "no"
8USE_NLS_glib-2.0 = "yes"
9
10TARGET_OS = "${UCLIBCTARGETOS}"
11
12CXXFLAGS += "-fvisibility-inlines-hidden"
13
14IMAGE_LINGUAS = ""
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 03c6c9b7d2..f8e03505f0 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -35,9 +35,11 @@ KERNEL_CONSOLE = "ttyS0"
35#INHIBIT_PACKAGE_STRIP = "1" 35#INHIBIT_PACKAGE_STRIP = "1"
36 36
37POKYMODE ?= "eabi" 37POKYMODE ?= "eabi"
38
39require conf/distro/include/poky-${POKYMODE}.inc 38require conf/distro/include/poky-${POKYMODE}.inc
40 39
40POKYLIBC ?= "glibc"
41require conf/distro/include/poky-${POKYLIBC}.inc
42
41# 43#
42# Preferred providers: 44# Preferred providers:
43# 45#
@@ -46,11 +48,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
46PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" 48PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
47PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" 49PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
48 50
49# Libc/uclibc:
50#fix some iconv issues, needs to be adjusted when doing uclibc builds
51PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
52PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
53
54# Virtuals: 51# Virtuals:
55PREFERRED_PROVIDER_virtual/db ?= "db" 52PREFERRED_PROVIDER_virtual/db ?= "db"
56PREFERRED_PROVIDER_virtual/db-native ?= "db-native" 53PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
@@ -186,7 +183,7 @@ PCMCIA_MANAGER ?= "pcmciautils"
186 183
187CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/" 184CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
188 185
189IMAGE_LINGUAS = "en-gb" 186IMAGE_LINGUAS ?= "en-gb"
190 187
191ENABLE_BINARY_LOCALE_GENERATION ?= "1" 188ENABLE_BINARY_LOCALE_GENERATION ?= "1"
192 189