[PATCH 0/3] Fix up ecj (gcj-jdk) downloads and update linaro versions

[Bryan Hundven]

This changeset fixes how ct-ng downloads ecj, and updates the linaro versions.

Enjoy,

-Bryan

Bryan Hundven (3):
config/gcc: no ecj-4.4.jar for gcc-4.4.x
scripts/cc: get the right ecj for the gcc version.
config/gcc: update linaro 4.7 and 4.8 releases

config/cc/gcc.in | 6 +++---
scripts/build/cc/gcc.sh | 17 ++++++++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)

[Bryan Hundven]

ftp://gcc.gnu.org/pub/java/
ecj-4.4.jar does not exist, so don't do it.

Signed-off-by: Bryan Hundven <***@gmail.com>
---
config/cc/gcc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 5051804..c9461d5 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -543,7 +543,7 @@ config CC_LANG_JAVA_USE_ECJ
bool
default y
depends on CC_LANG_JAVA
- depends on CC_GCC_4_3_or_later
+ depends on CC_GCC_4_3_or_later && !CC_GCC_4_4

# Fortran always requires GMP+MPFR, whatever the gcc version
config CC_LANG_FORTRAN

[Bryan Hundven]

If we look at:
ftp://gcc.gnu.org/pub/java/

Not all ecj-{MAJOR.MINOR}.jar versions are the same.
Grabbing latest is also naive, as it is NOT the latest ;)

Since we also have to deal with linaro version numbers, add a helper
function to extract the version number in a common way.

Signed-off-by: Bryan Hundven <***@gmail.com>
---
scripts/build/cc/gcc.sh | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 9dbc41e..3f6d94e 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -2,6 +2,15 @@
# Copyright 2007 Yann E. MORIN
# Licensed under the GPL v2. See COPYING in the root of this package

+# Discover the ecj version to get
+do_get_ecj_version() {
+ if [ "$(echo ${CT_CC_VERSION} | grep -o 'linaro')" = "linaro" ]; then
+ echo ${CT_CC_VERSION} | sed -r -e 's/linaro-([0-9]\.[0-9])-.*/\1/'
+ else
+ echo "${CT_CC_VERSION%.*}"
+ fi
+}
+
# Download gcc
do_cc_get() {
local linaro_version
@@ -36,8 +45,9 @@ do_cc_get() {
# GCC source tree, which will not be there unless we get it and
# put it there ourselves
if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then
- CT_GetFile ecj-latest .jar ftp://gcc.gnu.org/pub/java \
- ftp://sourceware.org/pub/java
+ CT_GetFile "ecj-$(do_get_ecj_version)" .jar \
+ ftp://gcc.gnu.org/pub/java \
+ ftp://sourceware.org/pub/java
fi
}

@@ -56,7 +66,8 @@ do_cc_extract() {
if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" \
-a ! -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/ecj.jar" \
]; then
- CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-latest.jar" "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/ecj.jar"
+ CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-$(do_get_ecj_version).jar" \
+ "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/ecj.jar"
fi
}

[Bryan Hundven]

Update release versions with the following:
https://launchpad.net/gcc-linaro/4.7
https://launchpad.net/gcc-linaro/4.8

Signed-off-by: Bryan Hundven <***@gmail.com>
---
config/cc/gcc.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index c9461d5..748062b 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -494,12 +494,12 @@ config CC_VERSION
# CT_INSERT_VERSION_STRING_BELOW
default "4.9.1" if CC_V_4_9_1
default "4.9.0" if CC_V_4_9_0
- default "linaro-4.8-2014.01" if CC_V_linaro_4_8
+ default "linaro-4.8-2014.08" if CC_V_linaro_4_8
default "4.8.3" if CC_V_4_8_3
default "4.8.2" if CC_V_4_8_2
default "4.8.1" if CC_V_4_8_1
default "4.8.0" if CC_V_4_8_0
- default "linaro-4.7-2014.01" if CC_V_linaro_4_7
+ default "linaro-4.7-2014.06" if CC_V_linaro_4_7
default "4.7.4" if CC_V_4_7_4
default "4.7.3" if CC_V_4_7_3
default "4.7.2" if CC_V_4_7_2