# HG changeset patch # User "Yann E. MORIN" # Date 1223220993 0 # Node ID 07a013bc98a4a5844663c57b3062a72f35def06e # Parent 0744defe782b575cf4eee6b4ac0f6174f19c46f2 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 -r 0744defe782b -r 07a013bc98a4 scripts/build/libc_glibc.sh --- a/scripts/build/libc_glibc.sh Wed Sep 17 21:35:08 2008 +0000 +++ b/scripts/build/libc_glibc.sh Sun Oct 05 15:36:33 2008 +0000 @@ -431,13 +431,7 @@ # 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 @@ 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