Backport #1026 from trunk: 1.2
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Oct 05 15:36:33 2008 +0000 (2008-10-05)
branch1.2
changeset 90407a013bc98a4
parent 864 0744defe782b
child 905 26c0b9e2925f
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(-)
scripts/build/libc_glibc.sh
     1.1 --- a/scripts/build/libc_glibc.sh	Wed Sep 17 21:35:08 2008 +0000
     1.2 +++ b/scripts/build/libc_glibc.sh	Sun Oct 05 15:36:33 2008 +0000
     1.3 @@ -431,13 +431,7 @@
     1.4  
     1.5      # Fix problems in linker scripts.
     1.6      #
     1.7 -    # 1. Remove absolute paths
     1.8 -    # Any file in a list of known suspects that isn't a symlink is assumed to be a linker script.
     1.9 -    # FIXME: test -h is not portable
    1.10 -    # FIXME: probably need to check more files than just these three...
    1.11 -    # Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks
    1.12 -    #
    1.13 -    # 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html,
    1.14 +    # Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html,
    1.15      # needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm
    1.16      #
    1.17      # To make "strip *.so.*" not fail (ptxdist does this), rename to .so_orig rather than .so.orig
    1.18 @@ -447,11 +441,7 @@
    1.19              if [ -f "${CT_SYSROOT_DIR}/${dir}/${file}" -a ! -L ${CT_SYSROOT_DIR}/$lib/$file ]; then
    1.20                  cp "${CT_SYSROOT_DIR}/${dir}/${file}" "${CT_SYSROOT_DIR}/${dir}/${file}_orig"
    1.21                  CT_DoLog DEBUG "Fixing '${CT_SYS_ROOT_DIR}/${dir}/${file}'"
    1.22 -                sed -i -r -e 's,/usr/lib/,,g;
    1.23 -                              s,/usr/lib64/,,g;
    1.24 -                              s,/lib/,,g;
    1.25 -                              s,/lib64/,,g;
    1.26 -                              /BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}"
    1.27 +                CT_DoExecLog ALL sed -i -r -e '/BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}"
    1.28              fi
    1.29          done
    1.30      done