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

[Sam James]

commit:     f479d2bc2575e06b2c2c10e54e287045bb9cebf6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 20:03:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 20:03:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f479d2bc

sys-devel/gcc: add 13.2.1_p20240120

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

 sys-devel/gcc/Manifest                    |  1 +
 sys-devel/gcc/gcc-13.2.1_p20240120.ebuild | 65 +++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 1d0715dfbbfb..8c7140eda6fa 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -26,6 +26,7 @@ DIST gcc-13-20231223.tar.xz 84352544 BLAKE2B 
1ec97e3b60bbf49d2106e8158e1ff66eb2e
 DIST gcc-13-20231230.tar.xz 84353432 BLAKE2B 
3efe49291b4727f5d343173ed8a92f10196dc54cc49adcb330f3d82963514527ba33a25a95287fc5d08e87035736979f9cecc9d6909061af41e9e6d458a9f9ac
 SHA512 
f7e6b79d638576ad67b8e4d4b0e151d2ba76f8bc97dca5103d9ed59138c7743eb5b2eb31e8cb85c26fa898a5d872874515c4796b84a019869c8cd98ac1497187
 DIST gcc-13-20240106.tar.xz 84368432 BLAKE2B 
e352f3994ff4e5626a8f278d488098b87183198d467230283e12706970596fd9f74d9245a97201c01f81da5ab21ed6cadce42467d98bc3803234be54a88fb25e
 SHA512 
698a61ac149c766bdfefd199ce8d2a5e35897c7d2060f1754c04a5b862ee661a9d618501d7aba829e937b56ca53a9a86e799bd74d3821628a058feea700239e2
 DIST gcc-13-20240113.tar.xz 84356052 BLAKE2B 
1fbfffc9f2afe443158e3f26182c8bdc3f3b599c5582762117831ecb6e6d3c1c69e8d2e5932f45eb7d534c3967e08a9f7b1bcec31aa5d7ac608bebff9f35120c
 SHA512 
a59886f707cf18f684295031d4d9fc5b03396face1705e61852d7de98729c53ac4cf209e951d00c232f14e9dc48eee40dd92487db7cb6ad0e80f2339d6d9503a
+DIST gcc-13-20240120.tar.xz 84362612 BLAKE2B 
d8aa2ebd73e2911c143505d2ed91bbab1ca4a11238bd58727ff997311bf679a714f4be7844b2570d467e46ed5a36e8316669603a278502ca7c8fa7af338a49f7
 SHA512 
2c8cc41be30529198c573cc69d1c5c9da1389e1c89f88ba931c7d2475abb8999a22f25f2e1fa75f61550c95e278bb26f2649cba6b298f6cfc8c6d098487552c6
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B 
c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb
 SHA512 
a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-11.tar.xz 46340 BLAKE2B 
c9f12ccbe7bb7ba3a2afec16695e69b062429779d544f5614e1ef0617751e54d77eb9bb6e19dc8c6132c57e630f0e77e2cc20cf2c77e0e79d03a6e57b9ba53c6
 SHA512 
a09801ecefccc66830607986a622bbcc5f217ba08da4ac9f68436e422b5a19042c60c7d5fcb75d4fe9ad9008ab06278382c9798b319ed9630c2e97fa09c3a344
 DIST gcc-13.2.0-patches-12.tar.xz 47404 BLAKE2B 
ed018bcd7429d1c7aace746cbfc4e59dae409fc0a35231320c1b44c96fff0d912eba5c72109c2deb883f5368159df02148b2d4373396b34da882164c61fe4387
 SHA512 
b7872a03870bce7b633e4af4329b24fe8f3d50d6d9173f63549f606ce062787748af7f79e7ec4afeb768968d6e8462a849bd1b94316ea6bb284551f99e811617

diff --git a/sys-devel/gcc/gcc-13.2.1_p20240120.ebuild 
b/sys-devel/gcc/gcc-13.2.1_p20240120.ebuild
new file mode 100644
index 000000000000..e295e327ec92
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.2.1_p20240120.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="13.2.0"
+PATCH_VER="12"
+MUSL_VER="2"
+MUSL_GCC_VER="13.2.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 ~loong ~m68k ~mips 
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+       :;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+       # Technically only if USE=hardened *too* right now, but no point in 
complicating it further.
+       # If GCC is enabling CET by default, we need glibc to be built with 
support for it.
+       # bug #830454
+       RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+       DEPEND="${RDEPEND}"
+       BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+       local p upstreamed_patches=(
+               # add them here
+       )
+       for p in "${upstreamed_patches[@]}"; do
+               rm -v "${WORKDIR}/patch/${p}" || die
+       done
+
+       toolchain_src_prepare
+
+       eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+       eapply_user
+}