Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/
Date: Wed, 29 Jun 2022 16:48:39
Message-Id: 1656521310.651120e58abc3df2e91b05a5df49b63bd955b792.sam@gentoo
1 commit: 651120e58abc3df2e91b05a5df49b63bd955b792
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 29 16:48:21 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 16:48:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=651120e5
7
8 sys-devel/gcc: add 10.4.0
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-devel/gcc/Manifest | 1 +
13 sys-devel/gcc/{gcc-10.4.9999.ebuild => gcc-10.4.0.ebuild} | 12 +++++++++++-
14 sys-devel/gcc/gcc-10.4.9999.ebuild | 2 +-
15 3 files changed, 13 insertions(+), 2 deletions(-)
16
17 diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
18 index be3687622bcb..41de53f9db4f 100644
19 --- a/sys-devel/gcc/Manifest
20 +++ b/sys-devel/gcc/Manifest
21 @@ -6,6 +6,7 @@ DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a6
22 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
23 DIST gcc-10.4.0-patches-0.tar.bz2 15231 BLAKE2B f64a2e7f317acf9416da69c129ea869116be2780828f9d3cda59f7ea8d39634df7f0347f745275bb167f95aae2a3b8e97ec7c78f775d9002718dd67cb9429f68 SHA512 d1497930ccf4d6ee8700faeb676945e65b3aa2ba3a580a3564575fad1590ad076741f2ecad778ab48d0c4e8ed7723b84b0a660cb67cc4530495691702159a43a
24 DIST gcc-10.4.0-patches-1.tar.xz 14392 BLAKE2B 76cc16bb611f1ac2020f0f430fc3f038e8ad29827e000b7aeca2a3143e91a674dee18b9530451fe37110c20dd3548ece387c323b460199e911e8195fc88eddf4 SHA512 f574ad66025eccb824e5901ef14f38268fc1fb26d9fc4fc9d04c8652c7bcee78ea196bdda88dbf891f167a6d7d75a74fb5776592dc25971c5902ba9d5d721266
25 +DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
26 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
27 DIST gcc-11-20220624.tar.xz 75765436 BLAKE2B 642bbda212f31344822ec90bce1422146515b153ddb306c5fd1bcf25be25fea7ed5bc1aa6f5987755969e73af5de1484fb79a805e87428bcfa0b13257b9c35df SHA512 736a71de166851816914561bfbe7c00110b32f8b7e1666176babdfcfbdef4410ba07c8e2d912da2830fa14c6732f9ca555cae127481b07a85f7e689d87f9d509
28 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
29
30 diff --git a/sys-devel/gcc/gcc-10.4.9999.ebuild b/sys-devel/gcc/gcc-10.4.0.ebuild
31 similarity index 75%
32 copy from sys-devel/gcc/gcc-10.4.9999.ebuild
33 copy to sys-devel/gcc/gcc-10.4.0.ebuild
34 index cdb2f335959c..3832361885ff 100644
35 --- a/sys-devel/gcc/gcc-10.4.9999.ebuild
36 +++ b/sys-devel/gcc/gcc-10.4.0.ebuild
37 @@ -1,11 +1,14 @@
38 # Copyright 1999-2022 Gentoo Authors
39 # Distributed under the terms of the GNU General Public License v2
40
41 -EAPI="7"
42 +EAPI=8
43
44 TOOLCHAIN_PATCH_SUFFIX="xz"
45 TOOLCHAIN_PATCH_DEV="sam"
46 +#TOOLCHAIN_GCC_RC=1
47 PATCH_GCC_VER="10.4.0"
48 +PATCH_VER="1"
49 +MUSL_VER="1"
50 MUSL_GCC_VER="10.4.0"
51
52 if [[ $(ver_cut 3) == 9999 ]] ; then
53 @@ -18,6 +21,13 @@ if [[ $(ver_cut 3) == 9999 ]] ; then
54
55 # e.g. 12.2.9999 -> 12.1.1
56 TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
57 +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
58 + # Cheesy hack for RCs
59 + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
60 + MY_P=${PN}-${MY_PV}
61 + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
62 + TOOLCHAIN_SET_S=no
63 + S="${WORKDIR}"/${MY_P}
64 fi
65
66 inherit toolchain
67
68 diff --git a/sys-devel/gcc/gcc-10.4.9999.ebuild b/sys-devel/gcc/gcc-10.4.9999.ebuild
69 index cdb2f335959c..d43d8bf4fbb3 100644
70 --- a/sys-devel/gcc/gcc-10.4.9999.ebuild
71 +++ b/sys-devel/gcc/gcc-10.4.9999.ebuild
72 @@ -1,7 +1,7 @@
73 # Copyright 1999-2022 Gentoo Authors
74 # Distributed under the terms of the GNU General Public License v2
75
76 -EAPI="7"
77 +EAPI=8
78
79 TOOLCHAIN_PATCH_SUFFIX="xz"
80 TOOLCHAIN_PATCH_DEV="sam"