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

["Sam James" <sam@gentoo.org>]

commit:     db62445e92a097c2c93da332e275dd772569dc82
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 04:53:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 04:53:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db62445e

sys-devel/gcc: add 10.4.1_p20230621

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

 sys-devel/gcc/Manifest                    |  1 +
 sys-devel/gcc/gcc-10.4.1_p20230621.ebuild | 60 +++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 74632a8a41c1..7f3393f54e41 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,6 +2,7 @@ DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba3
 DIST gcc-10-20230517.tar.xz 72135000 BLAKE2B 8ec87088ace2bf7cc355357b8c9b12e61646366ee1204a360f3be0dcc8b7d426ba5fbb7eb46b4da4c937f5b63d2181a3935f2894f40556f1472dd2a91197b38e SHA512 ae685e1e3fc3460ea49bd86b2b583ef97c71ed279cce6f06b293bd9c7f7ac5ae477b2f2057c4ed927114249e41f6f7978f13db678cd92935dc1250bdd11c94c5
 DIST gcc-10-20230607.tar.xz 72144348 BLAKE2B 96c95795bc2ec85e3380ddcbeb02e395e431cf7fd9966e55db132a4eeb2033c4453615cd768b4866cf13547cc9de3fb3562cab987268835784eae5c22de97c47 SHA512 488895b59132b83cfb0b9143d702d49cbd711b49817adcecb7b795147637a4e67902e8da7be04d26f39251e8e0ab6113448124d4c2220b79999da8f3ca4195da
 DIST gcc-10-20230614.tar.xz 72140228 BLAKE2B 7709d3cbb353a21206b4b522ce5ac9e92ea305a38f8825fde601c785faad08dfed3c5bb96a2203eee24b33d4488803fd1de41663b8adfe664ce59d008789eb48 SHA512 651d52bded7949191534d2dd8effc8cc8727592e2481fbf4905f8d0e7cbbcf3b7246ee9c8177d7c8e422f240eb0ff9ff1d2d9b813438292b3cc78df143add665
+DIST gcc-10-20230621.tar.xz 72149848 BLAKE2B 83d367c1fb8e68b3e61273a324cd3829ccd3091a1346bc88f76ee2d6c86fb4c644d30c0594a024df4d53c6c6a02eb2b98ba44ac6db7e8ea4ddb96c795e202d9b SHA512 b03520cf64643ac887e4c32c7e3a31ed54ff96bd5421ff2892675e26ae188ed8dcba88edbca79ec13bed3a052a98eea92fdd6bdd76ad1131a16f7c637a36360d
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
 DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd1246d37d23c2a8fc08bacd7d7ca84c353f3ccf5de2370ae5e5ca95c7ae3deab3565b3f65eb78b611dbe5ad4a256516f0 SHA512 fada917a832be5d2e15ee32f24e19fc87b851dc8e6fc75d1be6d25d3510dba408ae3ef3b245ff239c51aa3d243c95f12269695611e5c8965ba55f5aa4730778d

diff --git a/sys-devel/gcc/gcc-10.4.1_p20230621.ebuild b/sys-devel/gcc/gcc-10.4.1_p20230621.ebuild
new file mode 100644
index 000000000000..a3ff836547a0
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20230621.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="6"
+MUSL_VER="2"
+MUSL_GCC_VER="10.5.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+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="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#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
+}