[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/

[Sam James]

commit:     25502355aa9836b36958a574bc9612917704ab86
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 22:45:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 22:45:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25502355

sys-devel/gcc: add 10.4.1_p20230426

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gcc/Manifest                    |  1 +
 sys-devel/gcc/gcc-10.4.1_p20230426.ebuild | 58 +++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 76c253d802cf..896c29548e25 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,7 @@
 DIST gcc-10-20230119.tar.xz 72112952 BLAKE2B 
6e28cba9f6ff5c9f9231828bb400c82b8658a4f9c0166c28a6a12d71728d4460904152a8c84bbeff88c06b7f9378937b7b61bf4a871a10c56bd005170dc5fde2
 SHA512 
6cbb567ef1da1b6fa65892b6e71c3b7cd37e0c483e049720ea1987d444a0e7b4eb15d1e99f4e35995acdce560a811a779574eeba52bb252c61325accedd6a5c5
 DIST gcc-10-20230302.tar.xz 72112120 BLAKE2B 
8647639d9c6aef31b63566b006bb2980ca974e4aac4f5ced5f12a4f7fe0e9bda1e456d31f13dc478ab187d5e739ac850dd7dcc9db421ece1cadc50c952dbbed4
 SHA512 
97f72699b1a38de0dfb95253dc1602400fb05c2466b3682e51a4793d17db62e1d55b8d19211c3326e5369aace2a74345059b4b1c1a61a1f2c1c75a0aa9ec3e0e
 DIST gcc-10-20230419.tar.xz 72143336 BLAKE2B 
ffe2c39a0e99900d0c147908b3e2ebefff24460ec77b4835ae8ecd21bdc7e5b45865dbca16ff92e5ec7df6d0fa6c7629a77e2cf7d4113696bb6b25e42f6e24d8
 SHA512 
d1465b4b2f5c5d80c9d8fd6c4843246dea40c0d71925de47cdcb4ba2c426457dca876fefe7a2e46bd8bd933d28203aaab65dac12a981a2451716ff24584a40e8
+DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B 
d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c
 SHA512 
805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 
5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d
 SHA512 
86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-4.tar.xz 17880 BLAKE2B 
f368b741fd42199c85b770ec45a5232d27295cf7796163251f24fa963f2264c473e161bb34e66b43c4b227e41859d540a66331111392478b280b289d359806c6
 SHA512 
94f7fbd1b4672f0378c85ac3a96f7954cd22bd7cc1013c32519bbe1cae0ebb5183e14469c61dfc9d931b8d1c261f2ead1c4b47278104d1b5189a0c787aabc40e
 DIST gcc-10.5.0-patches-5.tar.xz 17324 BLAKE2B 
e97b471fb6115fd0421be8a6390f7d88312de7ac0132fde3aa43dbf2a49d3bc640ec05f766f20363f033adeaf0430e90c42b5a6f92a422d1a82128f119e769f6
 SHA512 
2589b8a3be0bc60dd7b205ef9955dfd1ba525508879b30ee8057779d2677783c7c13a0bf901bc2a126e15c52d440663e6fe22a299d935e0706a037406e1cfb31

diff --git a/sys-devel/gcc/gcc-10.4.1_p20230426.ebuild 
b/sys-devel/gcc/gcc-10.4.1_p20230426.ebuild
new file mode 100644
index 000000000000..07a2b5e91ab4
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230426.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="5"
+MUSL_VER="2"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+       MY_PV_2=$(ver_cut 2)
+       if [[ ${MY_PV_2} == 0 ]] ; then
+               MY_PV_2=0
+       else
+               MY_PV_2=$(($(ver_cut 2) - 1))
+       fi
+
+       # e.g. 12.2.9999 -> 12.1.1
+       TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+       # Cheesy hack for RCs
+       MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 
1)))-RC-$(ver_cut 5)
+       MY_P=${PN}-${MY_PV}
+       
GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz";
+       TOOLCHAIN_SET_S=no
+       S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#      KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+       local p upstreamed_patches=(
+               # add them here
+       )
+       for p in "${upstreamed_patches[@]}"; do
+               rm -v "${WORKDIR}/patch/${p}" || die
+       done
+
+       if has_version '>=sys-libs/glibc-2.32-r1'; then
+               rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || 
die
+       fi
+
+       toolchain_src_prepare
+}