1.1 --- a/scripts/build/libc/glibc.sh	Mon Jan 05 20:37:03 2009 +0000
     1.2 +++ b/scripts/build/libc/glibc.sh	Mon Jan 05 23:02:43 2009 +0000
     1.3 @@ -55,14 +55,24 @@
     1.4  
     1.5  # Extract glibc
     1.6  do_libc_extract() {
     1.7 -    CT_ExtractAndPatch "glibc-${CT_LIBC_VERSION}"
     1.8 +    CT_Extract "glibc-${CT_LIBC_VERSION}"
     1.9 +    CT_Patch "glibc-${CT_LIBC_VERSION}"
    1.10  
    1.11      # C library addons
    1.12      for addon in $(do_libc_add_ons_list " "); do
    1.13          # NPTL addon is not to be extracted, in any case
    1.14          [ "${addon}" = "nptl" ] && continue || true
    1.15          CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
    1.16 -        CT_ExtractAndPatch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
    1.17 +        CT_Extract "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
    1.18 +        # Some addons have the 'long' name, while others have the
    1.19 +        # 'short' name, but patches are non-uniformly built with
    1.20 +        # either the 'long' or 'short' name, whatever the addons name
    1.21 +        # so we have to make symlinks from the existing to the missing
    1.22 +        # Fortunately for us, [ -d foo ], when foo is a symlink to a
    1.23 +        # directory, returns true!
    1.24 +        [ -d "${addon}" ] || ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
    1.25 +        [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
    1.26 +        CT_Patch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
    1.27          CT_Popd
    1.28      done
    1.29