commit: e6dd44152e0e00f6dcbe01f4b5112a595a449252 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 13 06:02:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 13 06:02:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6dd4415
sys-devel/gcc: fix ifcombine bug in 15.0.0_pre20250112 This also fixes bootstrap in some cases. Bug: https://gcc.gnu.org/PR118409 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 1 + sys-devel/gcc/gcc-15.0.0_pre20250112-r1.ebuild | 53 ++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 2e7fbb6cb71e..67daed5ba2da 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -34,6 +34,7 @@ DIST gcc-15.0.0-patches-34.tar.xz 30468 BLAKE2B cabe6a1831d2c9397838853a9a094825 DIST gcc-15.0.0-patches-35.tar.xz 29968 BLAKE2B f662a1768f8766395ae8ad810fa74d4e0965d5cf33e0a2e65e352df1784768f4bd78ac35aa0295981a5c0f93b7041f973edec66bc1ec31fdac50226cbcde9f85 SHA512 9195a42910c47f81cf418dbe0f38e8a00c832e83942c6915fb0b196594c1bc2f0fde6a8b8f62169004190d69831c8981417ad16efd5b8f1dad33d8bf9c262230 DIST gcc-15.0.0-patches-36.tar.xz 27604 BLAKE2B bc7b7a1a7a906d257f524e04d88004c749c9957b567ea15029141d20ace4d1d62ea953063388e7c59fd64e7641c8d7f2b0ebbd3fb2b342f75de880a934cbe45b SHA512 eddb5d2de413849296e9a637b92b225e4a9f0034ec5db121755a570d02b1ca460c946df9e71e6803e6ad801873f1a5df63273ef527cc32d3800d31eeb2e6e56b DIST gcc-15.0.0-patches-37.tar.xz 24652 BLAKE2B 9a5f112ffaddf64d161d2ad2229a2ae04445a69d0f5b9ac3c5ab657aaa84fe1bd33fe4b426bfbaba2315faa0e2518f6b6b979d3201e33bb236ce78ec615ce828 SHA512 9be294bc4f79b0e54b946e0a117d81c6a4f15ddfc3d0497cf15ddef038a52c3548a6e31452824e41a7326b0a96d969b4e60b744c6f02ffd42401c604b3d592db +DIST gcc-15.0.0-patches-38.tar.xz 26648 BLAKE2B 87b9cb72886d59091d82969651b54d590dbf7a1ae63bcf127a1753b41bc6165126434a494da8526894fffcf2039884c08f0982481ba563c704911e6ddfe6dfe2 SHA512 b41cad4ec4031ae64ac00e3960a386538a55422d36db0f66bad337dd02b28edb900b9782e0d5a9e6a8083ed80ca5d1d0774bc56899958f4f5df5d0126cdc0160 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf diff --git a/sys-devel/gcc/gcc-15.0.0_pre20250112-r1.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20250112-r1.ebuild new file mode 100644 index 000000000000..155183970e74 --- /dev/null +++ b/sys-devel/gcc/gcc-15.0.0_pre20250112-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_HAS_TESTS=1 +PATCH_GCC_VER="15.0.0" +PATCH_VER="38" +MUSL_VER="2" +MUSL_GCC_VER="15.0.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=master +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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}" +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 +}
