[oe-commits] : Delete dummy libc.so that was created during glibc-initial step.

OE GIT Trial gittrial at amethyst.openembedded.net
Fri Aug 1 22:59:21 UTC 2008


Module: OE.dev
Branch: master
Commit: aa139921a272860e4406fc24286abe7354ba4ac5
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=aa139921a272860e4406fc24286abe7354ba4ac5

Author:  <khem at openembedded.org>
Date:   Fri Aug  1 21:35:52 2008 +0000

Delete dummy libc.so that was created during glibc-initial step. 
This library is overwritten by a linker script file called libc.so during 
complete glibc install so the packaged built after glibc is staged are fine.
But the binaries/libraries that build with glibc and depend on libc.so  in some
form see this dummy libc.so and gets things wrong.
This fix deletes the dummy libc.so before gcc-intermediate is staged. Because
the main purpose of dummy libc.so is to get gcc-intermediate built with shared
lib support. Ideally this libc.so should be deleted right after do_configure of
gcc-intermediate but gcc's configure is spread across and some configure stuff
happens during compile step. Therefore its best to delete this libc.so after
the compile step is done.

---

 packages/gcc/gcc-cross-intermediate.inc |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/packages/gcc/gcc-cross-intermediate.inc b/packages/gcc/gcc-cross-intermediate.inc
index 4fa1288..de260ed 100644
--- a/packages/gcc/gcc-cross-intermediate.inc
+++ b/packages/gcc/gcc-cross-intermediate.inc
@@ -16,6 +16,13 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
 		--with-build-sysroot=${STAGING_DIR_TARGET} \
 		${@get_gcc_fpu_setting(bb, d)}"
 
+do_stage_prepend () {
+	# get rid of dummy libc.so
+	if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then
+		rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
+	fi
+}
+
 do_install () {
 	:
 }





More information about the Openembedded-commits mailing list