diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 23:10:06 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-10-28 23:10:06 (GMT) |
| commit | de8f2cea32f14099cf756cbef40d312ffd1894a8 (patch) | |
| tree | af4f9ce5798909cfa1eadec07390425937e3886a /config/libc | |
| parent | 06cb0b6ddbbb2f9275b3a71eda3f2ffeff929d90 (diff) | |
| parent | 5b0242a30c12e4ce1366788126cea866b21abeba (diff) | |
Merge.
Diffstat (limited to 'config/libc')
| -rw-r--r-- | config/libc/eglibc.in | 12 | ||||
| -rw-r--r-- | config/libc/glibc.in | 15 | ||||
| -rw-r--r-- | config/libc/uClibc.in | 22 |
3 files changed, 21 insertions, 28 deletions
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index 877b6f3..f37ff89 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -28,19 +28,23 @@ config EGLIBC_V_2_9 config EGLIBC_V_2_8 bool - prompt "2_8" + prompt "2_8 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_2_7 bool - prompt "2_7" + prompt "2_7 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_2_6 bool - prompt "2_6" + prompt "2_6 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_2_5 bool - prompt "2_5" + prompt "2_5 (OBSOLETE)" + depends on OBSOLETE config EGLIBC_V_TRUNK bool diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 777657c..ac57fa0 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -26,23 +26,28 @@ config LIBC_V_2_8 config LIBC_V_2_7 bool - prompt "2.7" + prompt "2.7 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_6_1 bool - prompt "2.6.1" + prompt "2.6.1 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_6 bool - prompt "2.6" + prompt "2.6 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_5_1 bool - prompt "2.5.1" + prompt "2.5.1 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_5 bool - prompt "2.5" + prompt "2.5 (OBSOLETE)" + depends on OBSOLETE config LIBC_V_2_3_6 bool diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 81c3b28..d38f83d 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -26,25 +26,12 @@ config LIBC_V_0_9_30 config LIBC_V_0_9_29 bool - prompt "0.9.29" - -config LIBC_V_0_9_28_3 - bool - prompt "0.9.28.3" - -config LIBC_V_0_9_28_2 - bool - prompt "0.9.28.2 (OBSOLETE)" + prompt "0.9.29 (OBSOLETE)" depends on OBSOLETE -config LIBC_V_0_9_28_1 - bool - prompt "0.9.28.1 (OBSOLETE)" - depends on OBSOLETE - -config LIBC_V_0_9_28 +config LIBC_V_0_9_28_3 bool - prompt "0.9.28 (OBSOLETE)" + prompt "0.9.28.3 (OBSOLETE)" depends on OBSOLETE config LIBC_V_snapshot @@ -68,9 +55,6 @@ config LIBC_VERSION default "0.9.30" if LIBC_V_0_9_30 default "0.9.29" if LIBC_V_0_9_29 default "0.9.28.3" if LIBC_V_0_9_28_3 - default "0.9.28.2" if LIBC_V_0_9_28_2 - default "0.9.28.1" if LIBC_V_0_9_28_1 - default "0.9.28" if LIBC_V_0_9_28 default "snapshot" if LIBC_V_snapshot config LIBC_UCLIBC_0_9_30_or_later |