crosstool.mk: bump version gcc-linaro-5.2-2015.11-2 for apollo/kronos

diff --git a/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config b/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config
index 2d1c49ff95df6e078f98cba0e0375d0328c8f44a..37eb338b75feb1b716f28f64240f0fba93c6abe4 100644 (file)
--- a/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config
+++ b/archive-patches/ct-ng-1.20/ct-ng-1.21.0-2.config
@@ -361,8 +361,8 @@ CT_CC_CORE_PASS_2_NEEDED=y
 CT_CC_gcc=y
 CT_CC_GCC_CUSTOM=y
 CT_CC_GCC_CUSTOM_LOCATION="${CST_CUSTOM_GCC}"
-CT_CC_GCC_CUSTOM_VERSION="linaro-5.2-2015.11"
-CT_CC_GCC_VERSION="linaro-5.2-2015.11"
+CT_CC_GCC_CUSTOM_VERSION="linaro-5.2-2015.11-2"
+CT_CC_GCC_VERSION="linaro-5.2-2015.11-2"
 CT_CC_GCC_4_8_or_later=y
 CT_CC_GCC_4_9_or_later=y
 CT_CC_GCC_5_or_later=y

diff --git a/archive-patches/ct-ng-1.20/libstdc++_configure_patch.tar.xz b/archive-patches/ct-ng-1.20/libstdc++_configure_patch.tar.xz
index 42ed5fc02a86c9b943d7d536f5534935fe3a005f..329c53fbbcb657e4bacf95c8330dd9b40dc8eeb3 100644 (file)
Binary files a/archive-patches/ct-ng-1.20/libstdc++_configure_patch.tar.xz and b/archive-patches/ct-ng-1.20/libstdc++_configure_patch.tar.xz differ

diff --git a/make/archives.mk b/make/archives.mk
index 14299a57c82969e50d110980d8be1b08bcf4e077..99a3fc50b24aa256afeac4238b0206dbd71f91f4 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -229,8 +229,9 @@ $(ARCHIVE)/hd-idle-$(HD_IDLE_VER).tgz:
 $(ARCHIVE)/tzdata$(TZ_VER).tar.gz:
        $(WGET) ftp://ftp.iana.org/tz/releases/tzdata$(TZ_VER).tar.gz
 
+GV=`echo $(CUSTOM_GCC_VER) | cut -d'-' -f2-`
 $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz:
-       $(WGET) https://releases.linaro.org/components/toolchain/gcc-linaro/5.2-2015.11/gcc-linaro-5.2-2015.11.tar.xz
+       $(WGET) https://releases.linaro.org/components/toolchain/gcc-linaro/$(GV)/gcc-linaro-$(GV).tar.xz
 
 ## Crosstool 1.20.0 we use eglibc-2_18.tar.bz2 svn Rev. 25988
 $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2:

diff --git a/make/crosstool.mk b/make/crosstool.mk
index a57ab801f9e73b8f0f6d69da3b88b9dde909f03e..e055b4562f7ace53016e8fbd6603a702f1d1d082 100755 (executable)
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -21,7 +21,7 @@ CT_NG_CONFIG  = $(PATCHES)/ct-ng-1.20/ct-ng-nevis-1.20.0-1.config
 CUSTOM_KERNEL = $(ARCHIVE)/linux-$(CST_KERNEL_VERSION)-cnxt.tar.bz2
 CUSTOM_GCC    = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz
 
-crosstool: prerequisites | $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2 \
+crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-$(CROSSTOOL_NG_VER)-downloads.tar.bz2 \
 $(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC)
        mkdir -p $(BUILD_TMP); \
        $(UNTAR)/crosstool-ng-$(CROSSTOOL_NG_VER).tar.bz2; \
@@ -83,7 +83,7 @@ CUSTOM_KERNEL_VER = cst-kernel_cst_3.10.93_2015-12-02_0824_c439541
 CUSTOM_KERNEL     = $(ARCHIVE)/linux-$(CUSTOM_KERNEL_VER).tar.xz
 CUSTOM_GCC        = $(ARCHIVE)/gcc-$(CUSTOM_GCC_VER).tar.xz
 
-crosstool: prerequisites | $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz \
+crosstool: prerequisites | $(CUSTOM_GCC) $(ARCHIVE)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz \
 $(ARCHIVE)/$(CUSTOM_KERNEL_VER).tar.xz $(CUSTOM_GCC)
        make -p $(BUILD_TMP)
        $(UNTAR)/crosstool-ng-git-$(CROSSTOOL_NG_VER).tar.gz

diff --git a/make/versions.mk b/make/versions.mk
index 0cb7fa5fe5dd943056661ad3a018863d23871e69..e5bb6f3bf1287ef4347bb7e985ffc11f3dbf9c8a 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -9,8 +9,8 @@ CT_VER_KRONOS  = a0d58f4
 
 # Linaro GCC Versions
 GCC_VER_NEVIS  = linaro-4.9-2015.06
-GCC_VER_APOLLO = linaro-5.2-2015.11
-GCC_VER_KRONOS = linaro-5.2-2015.11
+GCC_VER_APOLLO = linaro-5.2-2015.11-2
+GCC_VER_KRONOS = linaro-5.2-2015.11-2
 
 
 UCLIBC_BUILD  = 1