diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-01-14 12:48:19 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-01-14 12:48:19 +0000 |
commit | 1fc2befdc13aa81d93a144d09fbd88e8954328d3 (patch) | |
tree | af20e041b1a1e596264e35f26cedb80a22ed8e8f | |
parent | 2025-01-14 12:33:32 UTC (diff) | |
parent | sys-devel/gcc: add more ifcombine patches to 15.0.0_pre20250112 (diff) | |
download | gentoo-1fc2befdc13aa81d93a144d09fbd88e8954328d3.tar.gz gentoo-1fc2befdc13aa81d93a144d09fbd88e8954328d3.tar.bz2 gentoo-1fc2befdc13aa81d93a144d09fbd88e8954328d3.zip |
Merge updates from master
-rw-r--r-- | sys-devel/gcc/Manifest | 1 | ||||
-rw-r--r-- | sys-devel/gcc/gcc-15.0.0_pre20250112-r2.ebuild | 53 |
2 files changed, 54 insertions, 0 deletions
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 4b3441733123..f1586d91821d 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -28,6 +28,7 @@ DIST gcc-14.2.0-patches-7.tar.xz 14244 BLAKE2B 11236e91e1fe83fec8ffaa40ec0cdd4b5 DIST gcc-15-20250112.tar.xz 90584884 BLAKE2B 35200ad43eaca0b97d330d22abb517ee5f8d196b83d40650e5a2e39b5a847b2c686108d15edf998df511992930bf3464b7e63d4562c17a6330a22a693b795122 SHA512 cd2b282eb7cd352fb326df692b653572319edc179ae6dec0c96ead858da4a85134098e128afa9dd76ff691262fd3cfce176c38420a78f56121b039a2a297f63e DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de DIST gcc-15.0.0-patches-38.tar.xz 26648 BLAKE2B 87b9cb72886d59091d82969651b54d590dbf7a1ae63bcf127a1753b41bc6165126434a494da8526894fffcf2039884c08f0982481ba563c704911e6ddfe6dfe2 SHA512 b41cad4ec4031ae64ac00e3960a386538a55422d36db0f66bad337dd02b28edb900b9782e0d5a9e6a8083ed80ca5d1d0774bc56899958f4f5df5d0126cdc0160 +DIST gcc-15.0.0-patches-39.tar.xz 31500 BLAKE2B 2b0862b4050ac9b803ce99108a300b2c825bbdbf263bd0112cf32fcfd28dbec5e12f3db65903d1d2a2d6974dba3cf52db5757c8dcf3c878d0e754560b802b323 SHA512 8f4d805642363975d4963ea370dc2e7e23feef831472a7aebe8bdc93574b585fe508286662489622f2e14b5a61db5f63da7701bbec6e4c239c45efb675155457 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-r2.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20250112-r2.ebuild new file mode 100644 index 000000000000..92b88ecd4ee5 --- /dev/null +++ b/sys-devel/gcc/gcc-15.0.0_pre20250112-r2.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="39" +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 +} |