From a9806af6894dad1314bd2329a447925141a7c60d Mon Sep 17 00:00:00 2001 From: Markham Date: Tue, 1 Mar 2016 18:59:53 +0100 Subject: [PATCH] crosstool.mk: bump version gcc-linaro-5.2-2015.11-2 for apollo/kronos --- .../ct-ng-1.20/ct-ng-1.21.0-2.config | 4 ++-- .../libstdc++_configure_patch.tar.xz | Bin 2120 -> 1780 bytes make/archives.mk | 3 ++- make/crosstool.mk | 4 ++-- make/versions.mk | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) 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 2d1c49f..37eb338 100644 --- 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 GIT binary patch delta 1775 zcmV@SVpr-Cp#?`sIk1bMR!)}l`814?Wi0VwG{7$S zVra4XI6$!*2fP<%EghMdls-fK+$V$flCyllx;+lrjLL32<$wDq=zWVW)$=Xe8cw~d zD!0n3%*A9cZ08#|dgX$(IDuSp$Xbn~0twMw7y?!!caA@u&SmUz!LzX|=4njI}slBPK4u4WDOF@#+S3NK+*ikx)| zH2;P&lA>;UXMg*euA+%RKAV_Ya;Pf3ns*Dt$z@jIx6F!icQmWL9TZVO_lPiG`sH&h z&grlObgQ@igK?80H(RXeoWi^XdPwmoB_n>b!fB@BjxjyLnUto1ea>6%i`LYjIb1)Bz zyB?Xm@7K0gvaXJ`dO}j>^-{xYnEoDCX-mq}SWQaxLCbRmMz0%R&hwEa$$Qx>{PF=F z2%DpbtACOqgW+5O;wOIt!pWh!`zgha?LT`%rj@KBjmn`gVrchJ^}WuD-G23eK3KL9 zyD)11%(llmBhL{Uzev~XJ8PKsHmi8;%IPnS?;C3XPBsm`KE|oBzl%F-5QffsPZG9l zcQ0tM#&c+qPk?)l)=~H!XY;Maf$CV$S<$s5!)1rw_0ibm=HM{33-n#Lw=g7-ScwHC8}RXN+?ojG%;-J(w2v~_iueDOUWNT6d!fX7gvTpccoPW z!lC6cSqhVazDQTIOn;`?-b29(%EL_OZ00e!>HjHe`lyc7(AnkMgeV?>h1N=k_BKEO zTz{66CnqZILfS!fw|&4x{Ll%gDxNcZ`Uz~` zqQA`alL(ciKFm7p&E%Zztd&8Sk%II(UIUjg?W@c&2RKJ{6;4l!E~IpXPv& zSiP`Dg&59aG&NMWWG*pia_Tz@_)ja*kyC9$mZX_&(_HJ>%v{(WVK_hBnxOxqn7|NZ}w z3Om?av!h!w$|v4<8B^&L^*}Xb>VMB6yp0Wy(z26&KmU2_o?Xqy-Q_qG++Uc7t58rl zvv}AFMug|_b2+l$)pm4xq*miX>BqlT3jLeWjghDDc?x zLOlB_)+G;7kt)GrNFs@3n17XT4o_X4dxx+@?SsQ1aknU9h3a+Y-Nq?uXC1Y3S9Dqi z_A)zfh#r=-i2mnaVp82fc$bg4eaToky zs+sn5*<8>2T RM2xY-XZr#G00004Sz7p+bKn2~ delta 2118 zcmV-M2)Xz44ag9X8Gl#*2nJmM7YoLRl3F{bkH;krxDU0aTy)}HRF%5VL9-C)5=Zf+ zw|aEnhw-_u%BZ+VmgdMia_2Q5SPj}ymt+FHzO-Swcrr1!9aYDe&XO(q&^k*MloqCc z%&-ksvO9SelOGHreu3ubZa+3!L)>=smW2W9dw=Vmy{1_y9ggc4tKu^@ zS0}wlglh)%ABRjFA_FUg3H=%SZ6|Fa2{VYnj! zdMD|w-=2_5+qdraTYj6YtaGm{Tj@+dJT8e{<8wWXg93%D@ss53WHL?Zsux+lzW8Xw zXUC7sL(}2tPJdD@Ryv$T0C!2!DA}Hl)f-kuj^*`T+#Tf3DsGLoJBqXCgA@F&6bCk2 zC@FvrDql3*?aD*f0*o3Xx!wy%Xy;y4$PBoHZ|oj$+(&xddu+IuX!(6v#YN5==94e+mWE*X zoh<8wAw*7q6NsXNdPMk$z^J^n$Cs1ykY z3H*Mv%74I6UpaFp_+6+-{dEdYWmZWZ%RzFle{`pRO(!60%73$^ueCsdN2m&TYMPQC1A>qG=Dk=T0CdLwqlx_q+uwapNeqBzpJz4 zSo{_tvoXh2Rry}7r%OMavNxwKczN|4S{AZra-#PYW6mB^g%NO2W|jf$w)3psAn_r5 zSpn(inuA~KXE3b{y?^TbpUVwSU(d^yHJ^i0whODe1EBwvXr`zeOorXBNt(RC{tJiPu_`~2T{qZU=HYXCx&oQ%MUr#mc< z_X|W7`SKylip&Z9b6tQh8KEd{KaCmx1CjR^^s;OR)m7>|jAaQ_?crtt@pb`=DRp1n zoR1c(+A-Nksrv`9Z`nSI!~kflec{XvTYo2`bU-_R6E>6Q0s%Gev+4Dz7Y^BLHr^cG z-*t4TsaHL4`FBjPDUWP&=YR*WC79oaXbvpH1eQwR_iKp^=_CUOptM^` zhqpx?12%O>tc7j6qWHOu+Kc^{zbKASRdr%X`%w~VOP$-iBDprDn^S8bedV?9Gf+#fwq9aASKeQk|z%4Kvf;)PQ` z(^dmau$rpG1;XQji`+7J%;D1`BY*0VX0@95yA_u}R2=jIutd5=+2sG2vc^d-aC0Gt z=Cd)-oE@JOq&ffTb7Dr1nqd)%alF=D$QU0zJ@-JYTeDMUAF-M~MG@OXo5^9s5eF(2 z33Wa2e(^^VUexL=653~nnl1}}!t4WcmOu_$6y3p_Ef<_&gb{t0P~{@E zRl=`~pAvf>++Q}s5}#ph(8*tuLQ0>TLn?v8#UdCz=Cg;DaQkFxzKY}BacV>#7!8ok zw-2^ip{%+YaRr|6GxghAsi)SZ*`ZbN!g|T@v(HIt3ABPn?YTZH$$wOw9>mHH1V2hC zkZ$qKR65EY*0>oqJJNco0v@7?6lrhElWSf6 z+9&}?-my0NX>#H<7kX~^Z57J}5obZcyyt9v(NxY90#T#o7UUSN%Jc5a9q6x~qPVtq zn*deIPO9!}ENbJSr+@f@*#sQezJvoXF+E!9c_)G|d9?O_>qBQGw)zzzJ-!K<_uI<3 z>agZU)g>PxCDyhN*DNjxcrac0GZgKm*U!rJomsMF1L|OT87p_Va78WpitBdXRUqkS ziO4%KG_?=AUi)DL<)FcSSYsxp{o4JD2sLLp#GNsHl-egmYk$oiRPlTSnxDA6lbH7T zn+FPX^gAOAYaOu0%2HSS)O+$?Csc{DIzpX{W>sd#)bC0f_TKQsjrQbA=e=OU1dBn;dSf! znEN@!gDw$clLos|4L;(VtY4*^Xx90tVy^~ID??MR%^2mOdPVdI?;Z{h{5-5HDOvho z;7)pJeu^5=N@l`aJ8v89Z>FyqQoaOwnt9X?HE2ak6h93X5+UqLdin@;mXz_7%85Wx wwodES1Pc57{geOz01xdQSWNUXlK=st5P+}=0N4Pe4za{%`vL#}000D8TDg`1O8@`> diff --git a/make/archives.mk b/make/archives.mk index 14299a5..99a3fc5 100755 --- 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 a57ab80..e055b45 100755 --- 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 0cb7fa5..e5bb6f3 100644 --- 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 -- 2.39.5