summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/binutils/binutils.in80
-rwxr-xr-xscripts/addToolVersion.sh22
2 files changed, 17 insertions, 85 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index ef59870..d5d9f54 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -6,7 +6,7 @@ config BINUTILS_CUSTOM
bool
prompt "Custom binutils"
depends on EXPERIMENTAL
- select BINUTILS_2_25_or_later
+ select BINUTILS_2_25_1_or_later
help
The choosen binutils version shall be not downloaded. Instead use
a custom location to get the source.
@@ -71,11 +71,6 @@ config BINUTILS_LINARO_V_2_25
select BINUTILS_2_25_or_later
depends on CC_BINUTILS_SHOW_LINARO
-config BINUTILS_V_2_25
- bool
- prompt "2.25"
- select BINUTILS_2_25_or_later
-
config BINUTILS_LINARO_V_2_24
bool
prompt "linaro-2.24.0-2014.11-2"
@@ -90,42 +85,7 @@ config BINUTILS_V_2_24
config BINUTILS_V_2_23_2
bool
prompt "2.23.2"
- select BINUTILS_2_23_or_later
-
-config BINUTILS_V_2_23_1
- bool
- prompt "2.23.1"
- select BINUTILS_2_23_or_later
-
-config BINUTILS_V_2_22
- bool
- prompt "2.22"
- select BINUTILS_2_22_or_later
-
-config BINUTILS_V_2_21_53
- bool
- prompt "2.21.53"
- select BINUTILS_2_21_or_later
-
-config BINUTILS_V_2_21_1a
- bool
- prompt "2.21.1a"
- select BINUTILS_2_21_or_later
-
-config BINUTILS_V_2_20_1a
- bool
- prompt "2.20.1a"
- select BINUTILS_2_20_or_later
-
-config BINUTILS_V_2_19_1a
- bool
- prompt "2.19.1a"
- select BINUTILS_2_19_or_later
-
-config BINUTILS_V_2_18a
- bool
- prompt "2.18a"
- select BINUTILS_2_18_or_later
+ select BINUTILS_2_23_2_or_later
endchoice
@@ -135,17 +95,9 @@ config BINUTILS_VERSION
# CT_INSERT_VERSION_STRING_BELOW
default "2.25.1" if BINUTILS_V_2_25_1
default "linaro-2.25.0-2015.01-2" if BINUTILS_LINARO_V_2_25
- default "2.25" if BINUTILS_V_2_25
default "linaro-2.24.0-2014.11-2" if BINUTILS_LINARO_V_2_24
default "2.24" if BINUTILS_V_2_24
default "2.23.2" if BINUTILS_V_2_23_2
- default "2.23.1" if BINUTILS_V_2_23_1
- default "2.22" if BINUTILS_V_2_22
- default "2.21.53" if BINUTILS_V_2_21_53
- default "2.21.1a" if BINUTILS_V_2_21_1a
- default "2.20.1a" if BINUTILS_V_2_20_1a
- default "2.19.1a" if BINUTILS_V_2_19_1a
- default "2.18a" if BINUTILS_V_2_18a
endif # ! BINUTILS_CUSTOM
@@ -159,34 +111,14 @@ config BINUTILS_2_25_or_later
config BINUTILS_2_24_or_later
bool
- select BINUTILS_2_23_or_later
-
-config BINUTILS_2_23_or_later
- bool
- select BINUTILS_2_22_or_later
+ select BINUTILS_2_23_2_or_later
-config BINUTILS_2_22_or_later
+config BINUTILS_2_23_2_or_later
bool
- select BINUTILS_2_21_or_later
-
-config BINUTILS_2_21_or_later
- bool
- select BINUTILS_2_20_or_later
select BINUTILS_HAS_GOLD
- select BINUTILS_HAS_PLUGINS
-
-config BINUTILS_2_20_or_later
- bool
- select BINUTILS_2_19_or_later
-
-config BINUTILS_2_19_or_later
- bool
- select BINUTILS_2_18_or_later
-
-config BINUTILS_2_18_or_later
- bool
- select BINUTILS_HAS_PKGVERSION_BUGURL
select BINUTILS_HAS_HASH_STYLE
+ select BINUTILS_HAS_PKGVERSION_BUGURL
+ select BINUTILS_HAS_PLUGINS
config BINUTILS_HAS_HASH_STYLE
bool
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index 0144e4f..b35ad0c 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -117,19 +117,19 @@ addToolVersion() {
fi
;;
binutils)
- # Extract 'M'ajor and 'm'inor from version string
+ # Extract 'M'ajor, 'm'inor, sometimes 'p'atch from version string
+ # TODO: Rework this
ver_M=$(getVersionField "${version}" . 1)
ver_m=$(getVersionField "${version}" . 2)
- if [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 22 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_22_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 21 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_21_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 20 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_20_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 19 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_19_or_later"
- elif [ \( ${ver_M} -eq 2 -a ${ver_m} -eq 18 \) ]; then
- SedExpr1="${SedExpr1}\n select BINUTILS_2_18_or_later"
+ ver_p=$(getVersionField "${version}" . 3)
+ if [ ${ver_M} -eq 2 -a ${ver_m} -eq 25 -a ${ver_p} -eq 1 ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_25_1_or_later"
+ elif [ ${ver_M} -eq 2 -a ${ver_m} -eq 25 -a -z ${ver_p} ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_25_or_later"
+ elif [ ${ver_M} -eq 2 -a ${ver_m} -eq 24 ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_24_or_later"
+ elif [ ${ver_M} -eq 2 -a ${ver_m} -eq 23 -a ${ver_p} -eq 2 ]; then
+ SedExpr1="${SedExpr1}\n select BINUTILS_2_23_2_or_later"
fi
;;
uClibc)