1.1 --- a/config/libc/glibc.in	Sun Jan 04 12:46:13 2009 +0000
     1.2 +++ b/config/libc/glibc.in	Sun Mar 15 20:50:40 2009 +0000
     1.3 @@ -38,13 +38,11 @@
     1.4  
     1.5  config LIBC_V_2_8
     1.6      bool
     1.7 -    prompt "2_8"
     1.8 -    select LIBC_GLIBC_2_8_or_later
     1.9 +    prompt "2.8"
    1.10  
    1.11  config LIBC_V_2_9
    1.12      bool
    1.13 -    prompt "2_9"
    1.14 -    select LIBC_GLIBC_2_8_or_later
    1.15 +    prompt "2.9"
    1.16  
    1.17  # CT_INSERT_VERSION_ABOVE
    1.18  # Don't remove above line!
    1.19 @@ -72,28 +70,48 @@
    1.20      default "2.6" if LIBC_V_2_6
    1.21      default "2.6.1" if LIBC_V_2_6_1
    1.22      default "2.7" if LIBC_V_2_7
    1.23 -    default "2_8" if LIBC_V_2_8
    1.24 -    default "2_9" if LIBC_V_2_9
    1.25 +    default "2.8" if LIBC_V_2_8
    1.26 +    default "2.9" if LIBC_V_2_9
    1.27  # CT_INSERT_VERSION_STRING_ABOVE
    1.28  # Don't remove above line!
    1.29  
    1.30 -config LIBC_GLIBC_2_8_or_later
    1.31 +choice
    1.32      bool
    1.33 -    default n
    1.34 +    prompt "Retrieval method"
    1.35 +    default LIBC_GLIBC_TARBALL
    1.36  
    1.37 -if LIBC_GLIBC_2_8_or_later
    1.38 +config LIBC_GLIBC_TARBALL
    1.39 +    bool
    1.40 +    prompt "Released tarball"
    1.41 +    help
    1.42 +      Until end of Februrary 2009, there was no tarball for glibc releases
    1.43 +      2.8 and later. This was intentional.
    1.44 +      
    1.45 +      Then, all of a sudden, tarballs for those releases have appeared at the
    1.46 +      traditional download place (ftp.gnu.org).
    1.47 +      
    1.48 +      Some of the glibc people argue that fixes are committed to the maintenance
    1.49 +      branch, and thus it is the best plac e to retrieve the glibc from.
    1.50 +      On the other hand, it might be preferable to always generate a toolchain
    1.51 +      using a known code-base, so the toolchain can be reproducible.
    1.52 +      
    1.53 +      For version prior to 2.8, tarballs were readily available.
    1.54 +      
    1.55 +      If you want your toolchain to really be reproducible, say 'Y' here.
    1.56 +      If you can live with a moving code-base, look at the other choice
    1.57 +      entries, below.
    1.58  
    1.59 -config LIBC_GLIBC_latest_snapshot
    1.60 +config LIBC_GLIBC_CVS
    1.61      bool
    1.62 -    prompt "Use latest nightly snapshot"
    1.63 -    default n
    1.64 +    prompt "CVS checkout"
    1.65      help
    1.66 -      Say 'y' to use the latest nightly snapshot.
    1.67 -      Not recommended, as the toolchain will not be reproducible.
    1.68 +      See the help for the entry "Released tarball", above.
    1.69 +      
    1.70 +      If you can live with a moving code-base, say 'Y' here.
    1.71 +      If you want your toolchain to really be reproducible, look at the
    1.72 +      choice entry "Released tarball from FTP", above.
    1.73  
    1.74 -if ! LIBC_GLIBC_latest_snapshot
    1.75 -
    1.76 -comment "Using CVS checkout"
    1.77 +if LIBC_GLIBC_CVS
    1.78  
    1.79  config LIBC_GLIBC_CVS_date
    1.80      string
    1.81 @@ -102,15 +120,16 @@
    1.82      help
    1.83        The date, in ISO-8601 format, at which to check out the repository.
    1.84  
    1.85 -#config LIBC_GLIBC_CVS_CHECKOUT
    1.86 +endif #  LIBC_GLIBC_CVS
    1.87 +
    1.88 +#config LIBC_GLIBC_SNAPSHOT
    1.89  #    bool
    1.90 -#    prompt "checkout instead of export"
    1.91 -#    default n
    1.92 +#    prompt "Use latest nightly snapshot"
    1.93  #    help
    1.94 -#      Use checkout rather than export, so that you can later update
    1.95 -#      the sources.
    1.96 -#      Not recommended, as the toolchain could be non-reproducible.
    1.97 +#      See the help for the entry "Released tarball", above.
    1.98 +#      
    1.99 +#      If you can live with a moving code-base, say 'Y' here.
   1.100 +#      If you want your toolchain to really be reproducible, look at the
   1.101 +#      choice entry "Released tarball from FTP", above.
   1.102  
   1.103 -endif # ! LIBC_GLIBC_latest_snapshot
   1.104 -
   1.105 -endif # LIBC_GLIBC_2_8_or_later
   1.106 +endchoice