summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default.inc2
-rw-r--r--meta/conf/distro/include/poky-eabi-csl2005q3-2.inc2
-rw-r--r--meta/conf/distro/include/poky-eglibc.inc17
-rw-r--r--meta/conf/distro/include/poky-glibc.inc14
-rw-r--r--meta/conf/distro/include/poky-uclibc.inc7
-rw-r--r--meta/packages/tasks/task-poky-standalone-sdk-target.bb32
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 c66a0833bb..3e493f7a2d 100644
--- a/meta/conf/distro/include/poky-default.inc
+++ b/meta/conf/distro/include/poky-default.inc
@@ -4,7 +4,7 @@
4 4
5TARGET_VENDOR = "-poky" 5TARGET_VENDOR = "-poky"
6 6
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" 7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = ${POKYLIBC}
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" 9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
10PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" 10PREFERRED_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 ab2de828f8..2b49670467 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 @@
2# Poky configuration to use CSL 2005q3-2 derived toolchain (ARM EABI) 2# Poky configuration to use CSL 2005q3-2 derived toolchain (ARM EABI)
3# 3#
4 4
5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" 5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}-intermediate"
6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" 7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" 8PREFERRED_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 57d6d28289..7b6acfd9f5 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"
27OLDEST_KERNEL_sparc64 ?= "2.4.21" 27OLDEST_KERNEL_sparc64 ?= "2.4.21"
28OLDEST_KERNEL_ppc64 ?= "2.4.21" 28OLDEST_KERNEL_ppc64 ?= "2.4.21"
29 29
30LIBC_DEPENDENCIES = "\
31 libsegfault \
32 eglibc \
33 eglibc-dbg \
34 eglibc-dev \
35 eglibc-utils \
36 eglibc-thread-db \
37 eglibc-localedata-i18n \
38 eglibc-gconv-ibm850 \
39 eglibc-gconv-cp1252 \
40 eglibc-gconv-iso8859-1 \
41 eglibc-gconv-iso8859-15 \
42 eglibc-binary-localedata-en.gb \
43 locale-base-en-gb \
44 "
45
46
diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc
index b76879e9e5..79abacf543 100644
--- a/meta/conf/distro/include/poky-glibc.inc
+++ b/meta/conf/distro/include/poky-glibc.inc
@@ -10,3 +10,17 @@ TARGET_OS = "${GLIBCTARGETOS}"
10 10
11CXXFLAGS += "-fvisibility-inlines-hidden" 11CXXFLAGS += "-fvisibility-inlines-hidden"
12 12
13LIBC_DEPENDENCIES = "\
14 libsegfault \
15 glibc \
16 glibc-dbg \
17 glibc-dev \
18 glibc-utils \
19 glibc-thread-db \
20 glibc-localedata-i18n \
21 glibc-gconv-ibm850 \
22 glibc-gconv-cp1252 \
23 glibc-gconv-iso8859-1 \
24 glibc-gconv-iso8859-15 \
25 locale-base-en-gb \
26 "
diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc
index 72e016af6f..edbcc4aa6d 100644
--- a/meta/conf/distro/include/poky-uclibc.inc
+++ b/meta/conf/distro/include/poky-uclibc.inc
@@ -18,3 +18,10 @@ IMAGE_LINGUAS = ""
18 18
19DEPLOY_DIR = "${TMPDIR}/deploy-uclibc" 19DEPLOY_DIR = "${TMPDIR}/deploy-uclibc"
20DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images" 20DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images"
21
22LIBC_DEPENDENCIES = "\
23 uclibc \
24 uclibc-dbg \
25 uclibc-dev \
26 uclibc-thread-db \
27 "
diff --git a/meta/packages/tasks/task-poky-standalone-sdk-target.bb b/meta/packages/tasks/task-poky-standalone-sdk-target.bb
index 7b446eba7d..4aa318881c 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 @@
1DESCRIPTION = "Target packages for the standalone SDK" 1DESCRIPTION = "Target packages for the standalone SDK"
2PR = "r5" 2PR = "r6"
3LICENSE = "MIT" 3LICENSE = "MIT"
4ALLOW_EMPTY = "1" 4ALLOW_EMPTY = "1"
5 5
@@ -10,33 +10,5 @@ RDEPENDS_${PN} = "\
10 libgcc-dev \ 10 libgcc-dev \
11 libstdc++ \ 11 libstdc++ \
12 libstdc++-dev \ 12 libstdc++-dev \
13 ${LIBC_DEPENDENCIES} \
13 " 14 "
14
15GLIBC_DEPENDENCIES = "\
16 libsegfault \
17 glibc \
18 glibc-dbg \
19 glibc-dev \
20 glibc-utils \
21 glibc-thread-db \
22 glibc-localedata-i18n \
23 glibc-gconv-ibm850 \
24 glibc-gconv-cp1252 \
25 glibc-gconv-iso8859-1 \
26 glibc-gconv-iso8859-15 \
27 locale-base-en-gb \
28 "
29
30RDEPENDS_${PN}_append_linux = "${GLIBC_DEPENDENCIES}"
31RDEPENDS_${PN}_append_linux-gnueabi = "${GLIBC_DEPENDENCIES}"
32
33UCLIBC_DEPENDENCIES = "\
34 uclibc \
35 uclibc-dbg \
36 uclibc-dev \
37 uclibc-thread-db \
38 "
39
40RDEPENDS_${PN}_append_linux-uclibc = "${UCLIBC_DEPENDENCIES}"
41RDEPENDS_${PN}_append_linux-uclibcgnueabi = "${UCLIBC_DEPENDENCIES}"
42