From 3ee9e2e9a150c848b80d05c97459d03ae1bc948e Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Sun, 2 Jan 2011 22:32:48 +0100
Subject: libc/glibc: normalize glibc hidden version names

Hidden version names for glibc conflicted:

LIBC_GLIBC_V_2.10.1
LIBC_V_2.10

name them constantly as:
LIBC_GLIBC_V_<version>

Reported-by: Esben Haabendal <eha@doredevelopment.dk>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 531555e..87da19e 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -62,46 +62,46 @@ config LIBC_GLIBC_V_2_11
     prompt "2.11 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
-config LIBC_V_2_10_1
+config LIBC_GLIBC_V_2_10_1
     bool
     prompt "2.10.1 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
     select LIBC_GLIBC_USE_PORTS
 
-config LIBC_V_2_9
+config LIBC_GLIBC_V_2_9
     bool
     prompt "2.9"
 
-config LIBC_V_2_8
+config LIBC_GLIBC_V_2_8
     bool
     prompt "2.8"
 
-config LIBC_V_2_7
+config LIBC_GLIBC_V_2_7
     bool
     prompt "2.7 (OBSOLETE)"
     depends on OBSOLETE
 
-config LIBC_V_2_6_1
+config LIBC_GLIBC_V_2_6_1
     bool
     prompt "2.6.1 (OBSOLETE)"
     depends on OBSOLETE
 
-config LIBC_V_2_6
+config LIBC_GLIBC_V_2_6
     bool
     prompt "2.6 (OBSOLETE)"
     depends on OBSOLETE
 
-config LIBC_V_2_5_1
+config LIBC_GLIBC_V_2_5_1
     bool
     prompt "2.5.1 (OBSOLETE)"
     depends on OBSOLETE
 
-config LIBC_V_2_5
+config LIBC_GLIBC_V_2_5
     bool
     prompt "2.5 (OBSOLETE)"
     depends on OBSOLETE
 
-config LIBC_V_2_3_6
+config LIBC_GLIBC_V_2_3_6
     bool
     prompt "2.3.6 (OBSOLETE)"
     depends on OBSOLETE
@@ -116,12 +116,12 @@ config LIBC_VERSION
     default "2.12.1" if LIBC_GLIBC_V_2_12_1
     default "2.11.1" if LIBC_GLIBC_V_2_11_1
     default "2.11" if LIBC_GLIBC_V_2_11
-    default "2.10.1" if LIBC_V_2_10_1
-    default "2.9" if LIBC_V_2_9
-    default "2.8" if LIBC_V_2_8
-    default "2.7" if LIBC_V_2_7
-    default "2.6.1" if LIBC_V_2_6_1
-    default "2.6" if LIBC_V_2_6
-    default "2.5.1" if LIBC_V_2_5_1
-    default "2.5" if LIBC_V_2_5
-    default "2.3.6" if LIBC_V_2_3_6
+    default "2.10.1" if LIBC_GLIBC_V_2_10_1
+    default "2.9" if LIBC_GLIBC_V_2_9
+    default "2.8" if LIBC_GLIBC_V_2_8
+    default "2.7" if LIBC_GLIBC_V_2_7
+    default "2.6.1" if LIBC_GLIBC_V_2_6_1
+    default "2.6" if LIBC_GLIBC_V_2_6
+    default "2.5.1" if LIBC_GLIBC_V_2_5_1
+    default "2.5" if LIBC_GLIBC_V_2_5
+    default "2.3.6" if LIBC_GLIBC_V_2_3_6
-- 
cgit v0.10.2-6-g49f6