Fix C library addons extraction:
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jan 05 20:37:03 2009 +0000 (2009-01-05)
changeset 1124eec7a46a4c19
parent 1123 8c5881324a79
child 1125 44037ce2db6d
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(-)
scripts/build/libc/eglibc.sh
scripts/build/libc/glibc.sh
scripts/functions
     1.1 --- a/scripts/build/libc/eglibc.sh	Sun Jan 04 22:17:53 2009 +0000
     1.2 +++ b/scripts/build/libc/eglibc.sh	Mon Jan 05 20:37:03 2009 +0000
     1.3 @@ -100,7 +100,6 @@
     1.4          [ "${addon}" = "nptl" ] && continue || true
     1.5          CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
     1.6          CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" nochdir
     1.7 -        [ ! -d "${addon}" ] && ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
     1.8          CT_Popd
     1.9      done
    1.10  
     2.1 --- a/scripts/build/libc/glibc.sh	Sun Jan 04 22:17:53 2009 +0000
     2.2 +++ b/scripts/build/libc/glibc.sh	Mon Jan 05 20:37:03 2009 +0000
     2.3 @@ -63,7 +63,6 @@
     2.4          [ "${addon}" = "nptl" ] && continue || true
     2.5          CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
     2.6          CT_ExtractAndPatch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
     2.7 -        [ ! -d "${addon}" ] && ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
     2.8          CT_Popd
     2.9      done
    2.10  
     3.1 --- a/scripts/functions	Sun Jan 04 22:17:53 2009 +0000
     3.2 +++ b/scripts/functions	Mon Jan 05 20:37:03 2009 +0000
     3.3 @@ -599,7 +599,7 @@
     3.4              .tar)         base=$(tar tf  "${full_file}" |head -n 1 |cut -d / -f 1 || true);;
     3.5          esac
     3.6          CT_TestOrAbort "There was a problem when extracting '${file}'" -d "${base}" -o "${base}" != "${file}"
     3.7 -        mv "${base}" "${file}"
     3.8 +        ln -s "${base}" "${file}"
     3.9      fi
    3.10  
    3.11      # Kludge: outside this function, we wouldn't know if we had just extracted