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

[Sam James]

commit:     5f33ed206f5fc73cfa17124b015a763fdb096c61
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 12:14:57 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 12:15:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f33ed20

sys-devel/gcc: add 13.1.1_p20230720 (13.2 RC1)

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

 sys-devel/gcc/Manifest                    |  1 +
 sys-devel/gcc/gcc-13.1.1_p20230720.ebuild | 66 +++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index dcff0ab9121b..4cc611557d7f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -19,6 +19,7 @@ DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 
06c43662c9abb0fa3cf90d5e2273c69ae
 DIST gcc-13-20230527.tar.xz 83956360 BLAKE2B 
86a2131b88144817673a6300c73b29c2dbb8559a7057609601029aaf60aeb4c4926fa4b99c4e1768726cde09f994159685768b62b3ca73d7b606847788301e82
 SHA512 
87566c74258f9981742eae77f552361c220f79fa6f17c36d5b5a9e73f41c50d8a2cab16b9ffb17f07829005f0d42b4b1d524150d3dcba9710091532cbfad7152
 DIST gcc-13-20230708.tar.xz 83997508 BLAKE2B 
b19c5f8bb90bb38f8e30e5cc04ddc7c26db007b309ce4007163b0be2d73fa0f8adbbcc318e9933e58ecdb52fa17d4b70221df4ac48f1b5fa28599e418bb71ae9
 SHA512 
c3fc449a6ec66786d3a6bd665749eed94108295e1c787c95e27e46311fd86d17f0e501636f2fb5db5d9f90d4a137632933056a8ff5fcb1988ffd4310adce95e3
 DIST gcc-13-20230715.tar.xz 84006392 BLAKE2B 
f55758258546e9a9a4ccc0f54be79d6a79a6975289fa0b5f28d843e1f2a28dca77fd8d7f3bd4d3bd5585340a05b65bcea44ffbced86735c8fae75b9261744a2b
 SHA512 
8fb6e33644b9bd991daa7f86359ca67a0b89c2093ea1e194c30e82d2eead87e5b26bfe798ef822cc057d0384eee4cf57a6dedc2c2cd27cff945ee74f2195407f
+DIST gcc-13.2.0-RC-20230720.tar.xz 87487800 BLAKE2B 
4be46dbeef3f68ff14cb58818653dbfa67675b78a5697e281e1fc2b2a8a4f2e79bb08463f0dfcd5ca8f84149f8768d773db70d2ec24cbf0604ed21de6644bed8
 SHA512 
a1fa3ad1e42b5444620220ba9cf69325881e6df8f9f45cbf36befe61c91d762c14016fa6490b0b854769e340e8da5a8a01a6232a1444434aa7afe3294900b0d9
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B 
c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb
 SHA512 
a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-3.tar.xz 30956 BLAKE2B 
29ce043b46645640ca1e983397af3e158588ad87575f0bc59451ea4a7dd5e3bb5b190ed031de6a22cd790d423ba111e95d222187dd09985dceb12db9f0a2d907
 SHA512 
4ffecae7be320124ad0c4e71e39e142b7aa8db0e70b5f486f491d7a33ea31efc6464c6abeea77df02a8bd5cf81f08225d625c8af5c27f9afa32c0d7d989f7a3c
 DIST gcc-14-20230716.tar.xz 84628612 BLAKE2B 
61498db17a0dc46c8fbbc051765065ed867abc58cec4e709ac374d716ed3a1ab134fd20aabe809490d5d00115f98fc4a4b3c6a3d4ed132dbc3aebb4ce15600f4
 SHA512 
7b17380723d1578ec8bbcaeff6421755957d3ba84fa9707be4a6704817952d084b70528060f4ae70bb80659a53ad7bd40db6dd11a35b82c1347bda80fe7b4865

diff --git a/sys-devel/gcc/gcc-13.1.1_p20230720.ebuild 
b/sys-devel/gcc/gcc-13.1.1_p20230720.ebuild
new file mode 100644
index 000000000000..65243b686bd1
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.1.1_p20230720.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="13.2.0"
+PATCH_VER="3"
+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 ~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
+}