# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1241339592 0
# Node ID 7ff235d979bf012fa61b240a36ee2d22a02bb8a3
# Parent  5a2255049210858aa3b757f696d2ee3bfdab6b60
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(+)

diff -r 5a2255049210 -r 7ff235d979bf config/libc/glibc-eglibc.in-common
--- a/config/libc/glibc-eglibc.in-common	Sun Apr 26 10:47:54 2009 +0000
+++ b/config/libc/glibc-eglibc.in-common	Sun May 03 08:33:12 2009 +0000
@@ -72,6 +72,12 @@
 
       Eg.: crypt        (for very old libces)
 
+if LIBC_GLIBC_2_8_or_later && ( LIBC_GLIBC_USE_PORTS || ( LIBC_ADDONS_LIST != "" ) )
+comment "WARNING!!!"
+comment "For glibc >= 2.8, addons are only available via a CVS checkout."
+comment "Be sure to review the associated options, above."
+endif
+
 if KERNEL_linux
 
 choice
diff -r 5a2255049210 -r 7ff235d979bf config/libc/glibc.in
--- a/config/libc/glibc.in	Sun Apr 26 10:47:54 2009 +0000
+++ b/config/libc/glibc.in	Sun May 03 08:33:12 2009 +0000
@@ -40,10 +40,12 @@
 config LIBC_V_2_8
     bool
     prompt "2.8"
+    select LIBC_GLIBC_2_8_or_later
 
 config LIBC_V_2_9
     bool
     prompt "2.9"
+    select LIBC_GLIBC_2_8_or_later
 
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
@@ -76,6 +78,10 @@
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
 
+config LIBC_GLIBC_2_8_or_later
+    bool
+    default n
+
 choice
     bool
     prompt "Retrieval method"
@@ -84,6 +90,7 @@
 config LIBC_GLIBC_TARBALL
     bool
     prompt "Released tarball"
+    depends on ! LIBC_GLIBC_2_8_or_later || ! ( LIBC_GLIBC_USE_PORTS || ( LIBC_ADDONS_LIST != "" ) )
     help
       Until end of Februrary 2009, there was no tarball for glibc releases
       2.8 and later. This was intentional.