# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1231187823 0
# Node ID eec7a46a4c19fbc084218c28886c31d22b42fc25
# Parent  8c5881324a793ed86456d3dca5dd6c8e8ea31e48
Fix C library addons extraction:
- renaming the dircetory in CT_ExtratAndPatch is wrong:
  - patches against the C library addons may be build against the short *or* long name... :-(
  - symlink is more robust, even if less nice
- renaming the directory _after_ CT_ExtractAndPatch is too late:
  - if patches are against the short name, and we renamed too the long name, patches don't apply
  - so we'll never reach the point where we rename

 /trunk/scripts/build/libc/glibc.sh  |    1     0     1     0 -
 /trunk/scripts/build/libc/eglibc.sh |    1     0     1     0 -
 /trunk/scripts/functions            |    2     1     1     0 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff -r 8c5881324a79 -r eec7a46a4c19 scripts/build/libc/eglibc.sh
--- a/scripts/build/libc/eglibc.sh	Sun Jan 04 22:17:53 2009 +0000
+++ b/scripts/build/libc/eglibc.sh	Mon Jan 05 20:37:03 2009 +0000
@@ -100,7 +100,6 @@
         [ "${addon}" = "nptl" ] && continue || true
         CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
         CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" nochdir
-        [ ! -d "${addon}" ] && ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
         CT_Popd
     done
 
diff -r 8c5881324a79 -r eec7a46a4c19 scripts/build/libc/glibc.sh
--- a/scripts/build/libc/glibc.sh	Sun Jan 04 22:17:53 2009 +0000
+++ b/scripts/build/libc/glibc.sh	Mon Jan 05 20:37:03 2009 +0000
@@ -63,7 +63,6 @@
         [ "${addon}" = "nptl" ] && continue || true
         CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
         CT_ExtractAndPatch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
-        [ ! -d "${addon}" ] && ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
         CT_Popd
     done
 
diff -r 8c5881324a79 -r eec7a46a4c19 scripts/functions
--- a/scripts/functions	Sun Jan 04 22:17:53 2009 +0000
+++ b/scripts/functions	Mon Jan 05 20:37:03 2009 +0000
@@ -599,7 +599,7 @@
             .tar)         base=$(tar tf  "${full_file}" |head -n 1 |cut -d / -f 1 || true);;
         esac
         CT_TestOrAbort "There was a problem when extracting '${file}'" -d "${base}" -o "${base}" != "${file}"
-        mv "${base}" "${file}"
+        ln -s "${base}" "${file}"
     fi
 
     # Kludge: outside this function, we wouldn't know if we had just extracted