gentoo auto-resync : 20:05:2024 - 00:02:15

3 files changed, 58 insertions, 1 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index a91322173e1e..35f4131cbbe0 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -25,6 +25,7 @@ DIST gcc-13.2.0-patches-15.tar.xz 47052 BLAKE2B f145341813d6baf9cbcc3e8421c7f427
 DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249ca0119ad362747a82d886fd10f77ceb05d02e033e906a090c67f44b1977f40df6a95206d81a32dd15e2f5413c6c92496 SHA512 324d9e63d16c35d55edde20de049162c01b0d487b4548d06c49f0da04a761ec255bc5e020cc2e7f60d12f5d129768afdcf7c86a59126f71f388ab375c34be6de
 DIST gcc-13.3.0-RC-20240514.tar.xz 87893144 BLAKE2B 2b46b464a7313c74ee4789804edef24e4edf9554696920b990ce6e7887e056672970b79dc6343c939617bcdcc724bf960313025759269d80c53f9c500ed51b57 SHA512 1ba0b3d3b0d9787ff3c32a491188c2b8a823b983e01a60b9d9c1ee2c6a83e09d09a275168c7eab7153637d1f3b1be415db3ee3ea6fcc22b6d458e4333a396693
 DIST gcc-14-20240511.tar.xz 88010940 BLAKE2B 98df36154ed111af8a0eed465eeda72145eb7df06dc6dbccb0918ab3fd583d1af46b87322f0b6113b41e89af64b3023ec76037c942aa7e08e5ec5a8e0f9cd731 SHA512 c0e9cdd687859c5531d9a17b148873b5a5c7e4e3495f5f96b0c4baefc7989e40df2118b16c0ec26a9ec968584be7a39480aad995e0eb40a046608df905834d82
+DIST gcc-14-20240518.tar.xz 87946040 BLAKE2B 83e567d680b1463cc672fb461aa180cf46555911f0e91a3fb89b11fe8b81d12d64b3a3419953849cf2deb38f1cdf0defc05169c145964f74c1105d942b5519f9 SHA512 73dae806add90e8b3cdfe1c56754ae886f6f6150ef4ef217664b48507ff19d20933648bb6a19ab62756146e83e4df037ced30e4504d562966c40b3750475f28f
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.1.0-patches-1.tar.xz 11584 BLAKE2B d483f4e3324acdc26b9837028d5e20ad0cdcf3ef4bcc78a6902d63ceebc7e5ff70c8163f6a8c8e36405df47c59dd2df506147c53ce51a8ec73494e65b5902647 SHA512 3d7aea113b594d1896c93e9e6be85f467488fa75de2800ed76eab2f87cef26829b235d1f361b187e38cf13b0fb9518cd4431c3106ec1e49d0f744e7eb703eaa0
 DIST gcc-14.1.0.tar.xz 92265736 BLAKE2B 7efd6574b8bca081de6e31480ec0565c6d7fb773383e8e1fdcc17e35bba2bf44b3f4f995cdbcccd001689926e96a6563ef3d099902fe3b37ab09dcf553ab0596 SHA512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea
@@ -57,7 +58,8 @@ EBUILD gcc-13.3.9999.ebuild 1635 BLAKE2B 06b81b06457d409fa4d837adb5e7d60c207546c
 EBUILD gcc-14.1.0-r1.ebuild 1475 BLAKE2B e25b99917c998a17ff7634bccf4fd1b133bc56f0346e39e6851bbb75f20c859895bf99af4dfd1decc3a8e4c1bd9bd96ef0df4df82e84a62b5b7bb06f2383cd1f SHA512 9dc820ac2f40f75550ddc8a404afbedfe273b0c6368c62161aa53e26e4f0e195bd1ecdbd4d21f8ca21fdfd2a7b483928a2d64ed67f08ab9391d94e536e09b8fb
 EBUILD gcc-14.1.0.ebuild 1421 BLAKE2B 058366274ed328844e97c6071519375252397425c04619b1dfc50fd9e917769092dc1f42277625f969e5b45b7476b30115abcda321f3285db784b7f6a4d492e4 SHA512 dd6fc016e3019e2675f8a019cff5f5cba7f7933d3155693926a507cf3d71e2b030e683d07a25890696b2a568efe89a5d8e1fdd88cdce865b661628e8f1ce6397
 EBUILD gcc-14.1.1_p20240511.ebuild 1421 BLAKE2B 058366274ed328844e97c6071519375252397425c04619b1dfc50fd9e917769092dc1f42277625f969e5b45b7476b30115abcda321f3285db784b7f6a4d492e4 SHA512 dd6fc016e3019e2675f8a019cff5f5cba7f7933d3155693926a507cf3d71e2b030e683d07a25890696b2a568efe89a5d8e1fdd88cdce865b661628e8f1ce6397
-EBUILD gcc-14.1.9999.ebuild 1394 BLAKE2B 6a8bef5a0638de6ddbc1126ffbc1af934d95243575a20bfa8dd6eb9f5c03572e1b8019d9439e7c59c4fa208373073a083796536694205967240c257b37f9d2ce SHA512 22c1e9406ee605d82e40fd0f34b538d09b4aacdd12f43f782ad23d915ea08e579bb67758b4500e1f7fc78fdf546203f4913250acecfff342748ef30ec433bd08
+EBUILD gcc-14.1.1_p20240518.ebuild 1479 BLAKE2B b75f3866606217737a9337428ed59cbc26bc7487b0d5c7fcb3478d82ab423171236746820cbdd38a9b1cc37678bb6e540e48a5e9b30b7e4c1c50916371cc0048 SHA512 d6a498978ee778845d1300aa5c573110543535bebbeb961e50895e3dfc705ced9140a09a19f93944b9282823da31d72fead7691ba55d6d59db0b57da0849171c
+EBUILD gcc-14.1.9999.ebuild 1453 BLAKE2B caee7ba2e0323b0953b53c822cfe76c70eebd466d80575612ae6daffdfbdb663266a9272691b33c4396bf8c70c81cf3c64035d9c5159f1ba9ed1e231ce739c1f SHA512 b1cc3de6f9f03b6e6558824cec9c19c8b4c424c769f8d02c0675c20f6c687b2ac27fb8d19646feb221570611e35248b8c22334b9207d27c401a5c34a54e34652
 EBUILD gcc-15.0.0_pre20240428.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.0_pre20240505.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.0_pre20240512.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240518.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240518.ebuild
new file mode 100644
index 000000000000..51d5147b906f
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.1.1_p20240518.ebuild
@@ -0,0 +1,54 @@
+# 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="14.1.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -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
+}
diff --git a/sys-devel/gcc/gcc-14.1.9999.ebuild b/sys-devel/gcc/gcc-14.1.9999.ebuild
index f576374d0692..b8c53ea9741a 100644
--- a/sys-devel/gcc/gcc-14.1.9999.ebuild
+++ b/sys-devel/gcc/gcc-14.1.9999.ebuild
@@ -47,5 +47,6 @@ src_prepare() {
 
 	toolchain_src_prepare
 
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
 	eapply_user
 }