1.1 --- a/config/libc/eglibc.in Wed Dec 26 13:34:55 2012 +0100
1.2 +++ b/config/libc/eglibc.in Wed Dec 26 12:15:10 2012 +0100
1.3 @@ -27,42 +27,35 @@
1.4 config LIBC_EGLIBC_V_2_15
1.5 bool
1.6 prompt "2_15"
1.7 - select LIBC_EGLIBC_2_15_or_later
1.8
1.9 config LIBC_EGLIBC_V_2_14
1.10 bool
1.11 prompt "2_14"
1.12 - select LIBC_EGLIBC_2_14_or_later
1.13
1.14 config LIBC_EGLIBC_V_2_13
1.15 bool
1.16 prompt "2_13"
1.17 - select LIBC_EGLIBC_2_13_or_later
1.18
1.19 config LIBC_EGLIBC_V_2_12
1.20 bool
1.21 prompt "2_12"
1.22 - select LIBC_EGLIBC_2_12_or_later
1.23
1.24 config LIBC_EGLIBC_V_2_11
1.25 bool
1.26 prompt "2_11"
1.27 - select LIBC_EGLIBC_2_11_or_later
1.28
1.29 config LIBC_EGLIBC_V_2_10
1.30 bool
1.31 prompt "2_10"
1.32 - select LIBC_EGLIBC_2_10_or_later
1.33
1.34 config LIBC_EGLIBC_V_2_9
1.35 bool
1.36 prompt "2_9"
1.37 - select LIBC_EGLIBC_2_9_or_later
1.38
1.39 config LIBC_EGLIBC_V_TRUNK
1.40 bool
1.41 prompt "'trunk'"
1.42 - select LIBC_EGLIBC_2_14_or_later
1.43 + select LIBC_EGLIBC_2_16_or_later
1.44 help
1.45 Selecting this will export the trunk of the eglibc subversion repository.
1.46
1.47 @@ -84,38 +77,10 @@
1.48
1.49 config LIBC_EGLIBC_2_16_or_later
1.50 bool
1.51 - select LIBC_EGLIBC_2_15_or_later
1.52 -
1.53 -config LIBC_EGLIBC_2_15_or_later
1.54 - bool
1.55 - select LIBC_EGLIBC_2_14_or_later
1.56 -
1.57 -config LIBC_EGLIBC_2_14_or_later
1.58 - bool
1.59 - select LIBC_EGLIBC_2_13_or_later
1.60 -
1.61 -config LIBC_EGLIBC_2_13_or_later
1.62 - bool
1.63 - select LIBC_EGLIBC_2_12_or_later
1.64 -
1.65 -config LIBC_EGLIBC_2_12_or_later
1.66 - bool
1.67 - select LIBC_EGLIBC_2_11_or_later
1.68 -
1.69 -config LIBC_EGLIBC_2_11_or_later
1.70 - bool
1.71 - select LIBC_EGLIBC_2_10_or_later
1.72 -
1.73 -config LIBC_EGLIBC_2_10_or_later
1.74 - bool
1.75 - select LIBC_EGLIBC_2_9_or_later
1.76 -
1.77 -config LIBC_EGLIBC_2_9_or_later
1.78 - bool
1.79 - select LIBC_EGLIBC_HAS_PKGVERSION_BUGURL
1.80
1.81 config LIBC_EGLIBC_HAS_PKGVERSION_BUGURL
1.82 bool
1.83 + default y
1.84
1.85 if CONFIGURE_has_svn
1.86
2.1 --- a/scripts/addToolVersion.sh Wed Dec 26 13:34:55 2012 +0100
2.2 +++ b/scripts/addToolVersion.sh Wed Dec 26 12:15:10 2012 +0100
2.3 @@ -143,16 +143,8 @@
2.4 # Extract 'M'ajor and 'm'inor from version string
2.5 ver_M=$(getVersionField "${version}" . 1)
2.6 ver_m=$(getVersionField "${version}" . 2)
2.7 - if [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 13 \) ]; then
2.8 - SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_13_or_later"
2.9 - elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 12 \) ]; then
2.10 - SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_12_or_later"
2.11 - elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 11 \) ]; then
2.12 - SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_11_or_later"
2.13 - elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 10 \) ]; then
2.14 - SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_10_or_later"
2.15 - elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 9 \) ]; then
2.16 - SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_9_or_later"
2.17 + if [ \( ${ver_M} -eq 2 -a ${ver_m} -ge 16 \) ]; then
2.18 + SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_16_or_later"
2.19 fi
2.20 ;;
2.21 uClibc)