1.4: backport #1495 from /trunk: 1.4
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun May 03 08:33:12 2009 +0000 (2009-05-03)
branch1.4
changeset 13167ff235d979bf
parent 1308 5a2255049210
child 1317 8fe0bb65a370
1.4: backport #1495 from /trunk:
- Force getting glibc>=2.8 via checkout if any addon is selected.

-------- diffstat follows --------
/branches/1.4/config/libc/glibc.in | 7 7 0 0 +++++++
/branches/1.4/config/libc/glibc-eglibc.in-common | 6 6 0 0 ++++++
2 files changed, 13 insertions(+)
config/libc/glibc-eglibc.in-common
config/libc/glibc.in
     1.1 --- a/config/libc/glibc-eglibc.in-common	Sun Apr 26 10:47:54 2009 +0000
     1.2 +++ b/config/libc/glibc-eglibc.in-common	Sun May 03 08:33:12 2009 +0000
     1.3 @@ -72,6 +72,12 @@
     1.4  
     1.5        Eg.: crypt        (for very old libces)
     1.6  
     1.7 +if LIBC_GLIBC_2_8_or_later && ( LIBC_GLIBC_USE_PORTS || ( LIBC_ADDONS_LIST != "" ) )
     1.8 +comment "WARNING!!!"
     1.9 +comment "For glibc >= 2.8, addons are only available via a CVS checkout."
    1.10 +comment "Be sure to review the associated options, above."
    1.11 +endif
    1.12 +
    1.13  if KERNEL_linux
    1.14  
    1.15  choice
     2.1 --- a/config/libc/glibc.in	Sun Apr 26 10:47:54 2009 +0000
     2.2 +++ b/config/libc/glibc.in	Sun May 03 08:33:12 2009 +0000
     2.3 @@ -40,10 +40,12 @@
     2.4  config LIBC_V_2_8
     2.5      bool
     2.6      prompt "2.8"
     2.7 +    select LIBC_GLIBC_2_8_or_later
     2.8  
     2.9  config LIBC_V_2_9
    2.10      bool
    2.11      prompt "2.9"
    2.12 +    select LIBC_GLIBC_2_8_or_later
    2.13  
    2.14  # CT_INSERT_VERSION_ABOVE
    2.15  # Don't remove above line!
    2.16 @@ -76,6 +78,10 @@
    2.17  # CT_INSERT_VERSION_STRING_ABOVE
    2.18  # Don't remove above line!
    2.19  
    2.20 +config LIBC_GLIBC_2_8_or_later
    2.21 +    bool
    2.22 +    default n
    2.23 +
    2.24  choice
    2.25      bool
    2.26      prompt "Retrieval method"
    2.27 @@ -84,6 +90,7 @@
    2.28  config LIBC_GLIBC_TARBALL
    2.29      bool
    2.30      prompt "Released tarball"
    2.31 +    depends on ! LIBC_GLIBC_2_8_or_later || ! ( LIBC_GLIBC_USE_PORTS || ( LIBC_ADDONS_LIST != "" ) )
    2.32      help
    2.33        Until end of Februrary 2009, there was no tarball for glibc releases
    2.34        2.8 and later. This was intentional.