From 48df3fe947c4d900aa6b66d9d8352c0d9e59ebe4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Aug 2012 23:16:11 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc-initial.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'meta/recipes-core/eglibc/eglibc-initial.inc') diff --git a/meta/recipes-core/eglibc/eglibc-initial.inc b/meta/recipes-core/eglibc/eglibc-initial.inc index 1020e402d3..3b99ac2854 100644 --- a/meta/recipes-core/eglibc/eglibc-initial.inc +++ b/meta/recipes-core/eglibc/eglibc-initial.inc @@ -32,6 +32,9 @@ do_install () { install-bootstrap-headers=yes install-headers oe_runmake csu/subdir_lib + mkdir -p ${D}${libdir}/ + install -m 644 csu/crt[1in].o ${D}${libdir} + # Two headers -- stubs.h and features.h -- aren't installed by install-headers, # so do them by hand. We can tolerate an empty stubs.h for the moment. # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html @@ -42,15 +45,10 @@ do_install () { if [ -e ${B}/bits/stdio_lim.h ]; then cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/ fi - mkdir -p ${D}${libdir}/ - install -m 644 csu/crt[1in].o ${D}${libdir} - ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \ - -o ${D}${libdir}/libc.so - - # add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this. - for t in linux asm asm-generic; do - ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/ - done + # add links to linux-libc-headers: final eglibc build need this. + for t in linux asm asm-generic; do + ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/ + done } do_install_locale() { -- cgit v1.2.3-54-g00ecf