summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/libc/eglibc.in39
-rwxr-xr-xscripts/addToolVersion.sh12
2 files changed, 4 insertions, 47 deletions
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index 1dd2c97..3473c4f 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -27,42 +27,35 @@ config LIBC_EGLIBC_V_2_16
config LIBC_EGLIBC_V_2_15
bool
prompt "2_15"
- select LIBC_EGLIBC_2_15_or_later
config LIBC_EGLIBC_V_2_14
bool
prompt "2_14"
- select LIBC_EGLIBC_2_14_or_later
config LIBC_EGLIBC_V_2_13
bool
prompt "2_13"
- select LIBC_EGLIBC_2_13_or_later
config LIBC_EGLIBC_V_2_12
bool
prompt "2_12"
- select LIBC_EGLIBC_2_12_or_later
config LIBC_EGLIBC_V_2_11
bool
prompt "2_11"
- select LIBC_EGLIBC_2_11_or_later
config LIBC_EGLIBC_V_2_10
bool
prompt "2_10"
- select LIBC_EGLIBC_2_10_or_later
config LIBC_EGLIBC_V_2_9
bool
prompt "2_9"
- select LIBC_EGLIBC_2_9_or_later
config LIBC_EGLIBC_V_TRUNK
bool
prompt "'trunk'"
- select LIBC_EGLIBC_2_14_or_later
+ select LIBC_EGLIBC_2_16_or_later
help
Selecting this will export the trunk of the eglibc subversion repository.
@@ -84,38 +77,10 @@ config LIBC_VERSION
config LIBC_EGLIBC_2_16_or_later
bool
- select LIBC_EGLIBC_2_15_or_later
-
-config LIBC_EGLIBC_2_15_or_later
- bool
- select LIBC_EGLIBC_2_14_or_later
-
-config LIBC_EGLIBC_2_14_or_later
- bool
- select LIBC_EGLIBC_2_13_or_later
-
-config LIBC_EGLIBC_2_13_or_later
- bool
- select LIBC_EGLIBC_2_12_or_later
-
-config LIBC_EGLIBC_2_12_or_later
- bool
- select LIBC_EGLIBC_2_11_or_later
-
-config LIBC_EGLIBC_2_11_or_later
- bool
- select LIBC_EGLIBC_2_10_or_later
-
-config LIBC_EGLIBC_2_10_or_later
- bool
- select LIBC_EGLIBC_2_9_or_later
-
-config LIBC_EGLIBC_2_9_or_later
- bool
- select LIBC_EGLIBC_HAS_PKGVERSION_BUGURL
config LIBC_EGLIBC_HAS_PKGVERSION_BUGURL
bool
+ default y
if CONFIGURE_has_svn
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index b82d485..2b3d130 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -143,16 +143,8 @@ addToolVersion() {
# Extract 'M'ajor and 'm'inor from version string
ver_M=$(getVersionField "${version}" . 1)
ver_m=$(getVersionField "${version}" . 2)
- if [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 13 \) ]; then
- SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_13_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 12 \) ]; then
- SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_12_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 11 \) ]; then
- SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_11_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 10 \) ]; then
- SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_10_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 9 \) ]; then
- SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_9_or_later"
+ if [ \( ${ver_M} -eq 2 -a ${ver_m} -ge 16 \) ]; then
+ SedExpr1="${SedExpr1}\n select LIBC_EGLIBC_2_16_or_later"
fi
;;
uClibc)