1.1 --- a/scripts/build/libc/glibc.sh	Sat Jan 03 21:11:41 2009 +0000
     1.2 +++ b/scripts/build/libc/glibc.sh	Sun Jan 04 12:46:13 2009 +0000
     1.3 @@ -4,23 +4,51 @@
     1.4  
     1.5  # Download glibc
     1.6  do_libc_get() {
     1.7 +   local date
     1.8 +
     1.9      # Ah! Not all GNU folks seem stupid. All glibc releases are in the same
    1.10      # directory. Good. Alas, there is no snapshot there. I'll deal with them
    1.11      # later on... :-/
    1.12 -    CT_GetFile "${CT_LIBC_FILE}"                        \
    1.13 -               {ftp,http}://ftp.gnu.org/gnu/glibc       \
    1.14 -               ftp://gcc.gnu.org/pub/glibc/releases     \
    1.15 -               ftp://gcc.gnu.org/pub/glibc/snapshots
    1.16 +    # Update: sadly, glibc folks do be stupid: they no longer build
    1.17 +    # release tarballs as of glibc-2.8, hence forcing us to fetch
    1.18 +    # from CVS (CVS! Don't those guys know the world of SCM has
    1.19 +    # evolved since the dawn ages of CVS?) Sigh...
    1.20 +    if [ "${CT_LIBC_GLIBC_2_8_or_later}" = "y" ]; then
    1.21 +        # No release tarball available...
    1.22 +        date="${CT_LIBC_GLIBC_CVS_date}"
    1.23 +        CT_GetCVS "${CT_LIBC_FILE}"                                     \
    1.24 +                  ":pserver:anoncvs@sources.redhat.com:/cvs/glibc"      \
    1.25 +                  "libc"                                                \
    1.26 +                  "glibc-${CT_LIBC_VERSION}-branch${date:+:}${date}"    \
    1.27 +                  "${CT_LIBC_FILE}"
    1.28  
    1.29 -    # C library addons
    1.30 -    for addon in $(do_libc_add_ons_list " "); do
    1.31 -        # NPTL addon is not to be downloaded, in any case
    1.32 -        [ "${addon}" = "nptl" ] && continue || true
    1.33 -        CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \
    1.34 +        # C library addons
    1.35 +        for addon in $(do_libc_add_ons_list " "); do
    1.36 +            # NPTL addon is not to be downloaded, in any case
    1.37 +            [ "${addon}" = "nptl" ] && continue || true
    1.38 +            CT_GetCVS "glibc-${addon}-${CT_LIBC_VERSION}"                   \
    1.39 +                      ":pserver:anoncvs@sources.redhat.com:/cvs/glibc"      \
    1.40 +                      "${addon}"                                            \
    1.41 +                      "glibc-${CT_LIBC_VERSION}-branch${date:+:}${date}"    \
    1.42 +                      "glibc-${addon}-${CT_LIBC_VERSION}"
    1.43 +        done
    1.44 +    else
    1.45 +        # Release tarballs are available
    1.46 +        CT_GetFile "${CT_LIBC_FILE}"                        \
    1.47                     {ftp,http}://ftp.gnu.org/gnu/glibc       \
    1.48                     ftp://gcc.gnu.org/pub/glibc/releases     \
    1.49                     ftp://gcc.gnu.org/pub/glibc/snapshots
    1.50 -    done
    1.51 +
    1.52 +        # C library addons
    1.53 +        for addon in $(do_libc_add_ons_list " "); do
    1.54 +            # NPTL addon is not to be downloaded, in any case
    1.55 +            [ "${addon}" = "nptl" ] && continue || true
    1.56 +            CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \
    1.57 +                       {ftp,http}://ftp.gnu.org/gnu/glibc       \
    1.58 +                       ftp://gcc.gnu.org/pub/glibc/releases     \
    1.59 +                       ftp://gcc.gnu.org/pub/glibc/snapshots
    1.60 +        done
    1.61 +    fi
    1.62  
    1.63      return 0
    1.64  }