diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-08-15 23:16:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 12:15:32 +0100 |
commit | 48df3fe947c4d900aa6b66d9d8352c0d9e59ebe4 (patch) | |
tree | 46ee821cd3792d650abecf095354e754343e2dad /meta/recipes-core/eglibc/eglibc.inc | |
parent | b0faebd1f07e1616004bd19664395932e7c2c48f (diff) | |
download | poky-48df3fe947c4d900aa6b66d9d8352c0d9e59ebe4.tar.gz |
eglibc: Fix eglibc-initial and let eglibc depend on it
eglibc-initial does not need to install fake shared libs
anymore so drop it.
eglibc now should depend on eglibc-initial so that bootstrap
sysroot gets populated properly.
Drop references to gcc intermediate from glibc testing
scripts.
(From OE-Core rev: bddc141e7cec18744902787ab53c21bf28e71f78)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc.inc')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 51061bc7bd..02f3c7a959 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc | |||
@@ -2,8 +2,8 @@ require eglibc-common.inc | |||
2 | require eglibc-ld.inc | 2 | require eglibc-ld.inc |
3 | require eglibc-testing.inc | 3 | require eglibc-testing.inc |
4 | 4 | ||
5 | STAGINGCC = "gcc-cross-intermediate" | 5 | STAGINGCC = "gcc-cross-initial" |
6 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate" | 6 | STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-initial" |
7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" | 7 | PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" |
8 | 8 | ||
9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" | 9 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" |
@@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ | |||
22 | " | 22 | " |
23 | 23 | ||
24 | # nptl needs unwind support in gcc, which can't be built without glibc. | 24 | # nptl needs unwind support in gcc, which can't be built without glibc. |
25 | DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" | 25 | DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial" |
26 | # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this | 26 | # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this |
27 | #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" | 27 | #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" |
28 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" | 28 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" |
@@ -33,7 +33,10 @@ require eglibc-options.inc | |||
33 | LEAD_SONAME = "libc.so" | 33 | LEAD_SONAME = "libc.so" |
34 | 34 | ||
35 | CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \ | 35 | CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \ |
36 | ac_cv_path_BASH_SHELL=${base_bindir}/bash" | 36 | ac_cv_path_BASH_SHELL=${base_bindir}/bash \ |
37 | libc_cv_ssp=no \ | ||
38 | " | ||
39 | |||
37 | GLIBC_EXTRA_OECONF ?= "" | 40 | GLIBC_EXTRA_OECONF ?= "" |
38 | GLIBC_EXTRA_OECONF_virtclass-nativesdk = "" | 41 | GLIBC_EXTRA_OECONF_virtclass-nativesdk = "" |
39 | INHIBIT_DEFAULT_DEPS = "1" | 42 | INHIBIT_DEFAULT_DEPS = "1" |