commit:     7ded4c8c77e58ddeed024b93fc6e13fc146c1ce0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 01:18:27 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 01:18:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ded4c8c

sys-devel/gcc: add 13.3.1_p20240614

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

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

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index c8d35319578a..09f07a4fde01 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -24,6 +24,7 @@ DIST gcc-13-20240503.tar.xz 84417232 BLAKE2B 
4024852c3252667054e6086263b2a0e21df
 DIST gcc-13-20240524.tar.xz 84442852 BLAKE2B 
71b4d84b73c122a25db4eaacdd07d9f6920951d1daefae353c060d2360f1614c9e465df404e2ad30f5595d9d25a8ac87d5f481fb619a1fb8aae460d3c990252d
 SHA512 
02e2dfb2a03e9e5d5973781e3556ddcc36861285c7c4dc8b82cde420ef34e322eb206f89cc81aad2c3e932d9e0e3565efbcc1f065971e997e730c75fbaad91a1
 DIST gcc-13-20240531.tar.xz 84452600 BLAKE2B 
bf0938328073073d9876cfccd54ee12e60e99a8cf159457825b104a70ef7d09537e40b4f1a2f09a3b5420c3c01facb9151d7e8f595d58d594b9d5cec2f06b552
 SHA512 
404b44f8073eadb80e781ee9ef5d3709f83ac7c43d6a703b8df81f30201c7c88b837019b961b0d71c6dcd7f83fb5b2c087d7e561748e50dca10e3116159dbda1
 DIST gcc-13-20240607.tar.xz 84516980 BLAKE2B 
0b00dc4b4c1b5a72cb935cbd854d618e18bfd92b48b70dfb69d7b7cc509871a5400bbeb656a22cd02fe37eda52d27206a7fb3f32bae8a761716ebad5bb320325
 SHA512 
414849323c42934b958f871b30a517e7db097c538185bebbb584ba17ea1b40a42bc002f5fab88df8900fa4c8fa89028cc8bca7db31e1e1370109ba2ab64e0bdd
+DIST gcc-13-20240614.tar.xz 84463660 BLAKE2B 
a1b551ff633c31d6972fed173f248ba5f6696eb1566801e180b78a7c7e20933b1aaae40839b4f1529d61166de55125395d4f9a812511c088e73f975bf1d2167f
 SHA512 
1a543ddfb56e793367a43895a7ce4f97daeca6ffd5234ce50e8a7ae0f8db1071e01bdd653fda40d00eb7a680faead8f1d8d1295f983086a33a4c75e4affa2ea5
 DIST gcc-13.2.0-musl-patches-2.tar.xz 5292 BLAKE2B 
c057d6574d03c05854edaa9f3fd40e9149662b04f3ac7a7db3eb078d73a7b535726d1bf52e5b12736dedb2f9898ad731f2e48a6421fcfbf7b90f929dee072fcb
 SHA512 
a691da0c87c443a5e9d23731f4005f27871c5b12bc9102873ffa24d374aa7b9fbd187c4f5635d23fa9ffb17e351e76173c2d3fdf40646e355c4cb314b538de69
 DIST gcc-13.2.0-patches-14.tar.xz 46928 BLAKE2B 
fce23bc5315f35b04a4976550c4b44578944a1b17e40c7553351eeb8a1ef0f3a2538da5a5e1ae6f37b784ff11bbd8a44b8f6eec542be63e34d984dee69e1cd81
 SHA512 
d7d52bb2915fd89c06b0134bede8db939cadbb1f2dcddf923bee2c3f9f577ff9e5e986b60420d892539edf82867a0d1bd635807814bc618b06a2b37cdaca893a
 DIST gcc-13.2.0-patches-15.tar.xz 47052 BLAKE2B 
f145341813d6baf9cbcc3e8421c7f427148503d2aeddd6a2eaac1ad3d470a818292392861542a7915d8b0f2f9b3255603f394b2e6833141658fc035bcd2b5366
 SHA512 
c89a3fccd944f03d25e076a967c3b220803ee9a6fbedec1daf2c20f629dd6162ce6be4f259522bd193169f0e8307daa9895b5d8581cf975ee086e5abfd675e34

diff --git a/sys-devel/gcc/gcc-13.3.1_p20240614.ebuild 
b/sys-devel/gcc/gcc-13.3.1_p20240614.ebuild
new file mode 100644
index 000000000000..d0662c3779cf
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.3.1_p20240614.ebuild
@@ -0,0 +1,66 @@
+# 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"
+MUSL_GCC_VER="13.2.0"
+PATCH_VER="17"
+MUSL_VER="2"
+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 ~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="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 "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+       eapply_user
+}

Reply via email to