commit:     2f6edc478bd374bb78197f6ef532fde4d63ba632
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 01:15:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 01:15:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f6edc47

sys-devel/gcc: add 12.3.1_p20240613

Notes:
* 12.4 RC1 was released the same day but may as well just use the snapshot,
the same thing anyway.

* This has the fix for bug #933423 but given 12.4 will be here soon,
not keywording this one.

Bug: https://bugs.gentoo.org/933423
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 572a79d90de5..c8d35319578a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -16,6 +16,7 @@ DIST gcc-12-20240516.tar.xz 79851552 BLAKE2B 
0ae06aa8b15be704863648bd2dffd183e5c
 DIST gcc-12-20240523.tar.xz 79858692 BLAKE2B 
fbe5ff714252f9905610ddf48896059c2c2b7e2b672a00e5cd24e6830d304a9889615d756c42be7fe5383f3e680174e3c0db7be759bbaca9c770f7c66c8f1923
 SHA512 
8d079cca2ab597eb3190e4b921890d92d652fee7cec69b3aae64d388e753e0b8b4e15492c5ed59a9be1f38451029e5b52567ecb2370ac2f39257dd42b25bf637
 DIST gcc-12-20240530.tar.xz 79864712 BLAKE2B 
766af7d9cb4a7db80b246d36097914193cb774766e38b182a2dee9ea5fa54cccc1962b272c374ce050b34ebeee52e1e1259f4880d5ee9f534c9c78e93376f358
 SHA512 
dbcfbe933b78b65605d28d959dc7557590823e1d3739bd4ff6cdf3d6e89b42d46ccb062270ebefc627272baf021f11a79587e981bcf64931323219a37afcb78c
 DIST gcc-12-20240606.tar.xz 79866660 BLAKE2B 
4b9e4564ea3a1b5fea4171803fdf9601fd0b5e1e8c20b1ceb41b1355911e3518b49254f561dee3db5f946ff589a132908f945e0f6133a9030e9849d15e3b57de
 SHA512 
a9354ab4c85057ab627d8b04cd9d918fc744bf84916a55e53a2031ca7942c5fd02aeaa448777b6b14c6f511e8b3c154d78f3a6d34149846c1b18ed5d47add4d5
+DIST gcc-12-20240613.tar.xz 79875076 BLAKE2B 
48b57f834df842c72e08dc9ae3637fdc5fb381f0f50a045a43ff3003271b7e8fa3c92a420447911a71df1184b25c2aad084d80bef8194a6468ddc21b1730b69e
 SHA512 
1d149f6347f314a414bb279e20ae48bea2c9baa03257e3636515a74b389065a7cb6e5257f62334a307ebf6ef7ff142362e69967acc33b92a7fe21eea2bd52ee5
 DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B 
c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5
 SHA512 
babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326
 DIST gcc-12.3.0-patches-3.tar.xz 14852 BLAKE2B 
7a5f1f43063b15f424099afd72096212fbbbc5151ff01f2de15dfb6e7cf274981c8cfaedba9ef61576c9096fb172fc550a7deb5cd7d9366fd249fd5dd3951f76
 SHA512 
aa89e4c2ae02f4fb42229ad5167f2eaa3a8fae51118645bf07199fe2124b9c83948590662b053d08002ef709fa870ea88315fd4ccbe4441a74e9cb62edcb82fb
 DIST gcc-13-20240210.tar.xz 84354416 BLAKE2B 
5807623d3f7dd751b6dfe164cfd50d57b2f93485c23c3c2228a4a846a9a94cdad52a5e6f2806e5e7ee2a7b5526386ebdb339c44c7ea023d69f8652088a1b114d
 SHA512 
14a01ced7ac2bfd9fc93de4e3819b4d0823fbe129d3f1faabeb707e9e3e2613b4173321b58b3648a7250e3b7ff5d94edfee60e6c38682f31a1f7b57b1c01433f

diff --git a/sys-devel/gcc/gcc-12.3.1_p20240613.ebuild 
b/sys-devel/gcc/gcc-12.3.1_p20240613.ebuild
new file mode 100644
index 000000000000..1f38c9fc478d
--- /dev/null
+++ b/sys-devel/gcc/gcc-12.3.1_p20240613.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="12.3.0"
+PATCH_VER="3"
+MUSL_VER="1"
+MUSL_GCC_VER="12.3.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+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="amd64? ( >=${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_user
+}

Reply via email to