From aa5541b302b10e7d8cfa277339e81e0ab81b6e07 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 5 Oct 2008 15:36:33 +0000 Subject: Backport #1026 from trunk: Removing absolute paths from the libc linker scripts is plainly wrong. /branches/1.2/scripts/build/libc_glibc.sh | 14 2 12 0 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh index 2d9568a..59cb430 100644 --- a/scripts/build/libc_glibc.sh +++ b/scripts/build/libc_glibc.sh @@ -431,13 +431,7 @@ do_libc() { # Fix problems in linker scripts. # - # 1. Remove absolute paths - # Any file in a list of known suspects that isn't a symlink is assumed to be a linker script. - # FIXME: test -h is not portable - # FIXME: probably need to check more files than just these three... - # Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks - # - # 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html, + # Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html, # needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm # # To make "strip *.so.*" not fail (ptxdist does this), rename to .so_orig rather than .so.orig @@ -447,11 +441,7 @@ do_libc() { if [ -f "${CT_SYSROOT_DIR}/${dir}/${file}" -a ! -L ${CT_SYSROOT_DIR}/$lib/$file ]; then cp "${CT_SYSROOT_DIR}/${dir}/${file}" "${CT_SYSROOT_DIR}/${dir}/${file}_orig" CT_DoLog DEBUG "Fixing '${CT_SYS_ROOT_DIR}/${dir}/${file}'" - sed -i -r -e 's,/usr/lib/,,g; - s,/usr/lib64/,,g; - s,/lib/,,g; - s,/lib64/,,g; - /BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}" + CT_DoExecLog ALL sed -i -r -e '/BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}" fi done done -- cgit v0.10.2-6-g49f6