From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1537574-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9168615800A for <garchives@archives.gentoo.org>; Sat, 15 Jul 2023 07:09:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D155AE088C; Sat, 15 Jul 2023 07:09:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF01FE088C for <gentoo-commits@lists.gentoo.org>; Sat, 15 Jul 2023 07:09:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABA56335DE9 for <gentoo-commits@lists.gentoo.org>; Sat, 15 Jul 2023 07:09:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 074F769 for <gentoo-commits@lists.gentoo.org>; Sat, 15 Jul 2023 07:09:05 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1689404816.e8689417d230d52b063778221115856fc28ae9dd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gcc/Manifest sys-devel/gcc/gcc-11.4.1_p20230713.ebuild X-VCS-Directories: sys-devel/gcc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e8689417d230d52b063778221115856fc28ae9dd X-VCS-Branch: master Date: Sat, 15 Jul 2023 07:09:05 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 14392fa1-3889-43ad-b3e3-da94b6325ca0 X-Archives-Hash: 0be5e046dfd8712b7080b90349f6226c commit: e8689417d230d52b063778221115856fc28ae9dd Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jul 15 07:06:56 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jul 15 07:06:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8689417 sys-devel/gcc: add 11.4.1_p20230713 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 1 + sys-devel/gcc/gcc-11.4.1_p20230713.ebuild | 64 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index a8e811c9f373..00d44a6ba3b1 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -7,6 +7,7 @@ DIST gcc-11-20230427.tar.xz 76165128 BLAKE2B dd896b418c1fce35a61005d5b5c90cfd124 DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf230e506773c85977156b187f12664f2cd3e0992a1faefda8ec88ff85d1a8d12795121baadc7e8b9653d69a8025e46e SHA512 8dbc5a4b54f2bc52458914705af40a00b33e46061dd5b335b4b4a6e96d17206fe480d3fec564dd11ebcca6168f054984d706b1b26b7e694e8b327692a13ae7d1 DIST gcc-11-20230629.tar.xz 76208088 BLAKE2B c2ced5e441c93f985a8747a763f908dbbadcef905a1038db89a771c478c15dc516faca038daa4ed6356ef6848b132177a8a0ebeb333abf6f7149445782f1eecd SHA512 183af1d37650d57232d56f4a46d2f17064683189061b55db314ab8e66e5ecc8d8cd31114c1427339c1dda242a04fe989730cf5a169f13dc6629c60ccd61fdd53 DIST gcc-11-20230706.tar.xz 76209132 BLAKE2B 87522d0e5cffd9eedfcf20dfc2431fc3c0f4405d9c311e1455e530a58ef9b2e878c6e1067494a9d3b3d7d13a3715f45bdb463bce4a4b60a9c0a9f2b7c7c92b7d SHA512 eff4422c7cc954d6387e0d8bf18844f3c2ee310954aaffee51c9da0d6e9ad372e8942394c8a7f20df434fae0b0c2f1a003d8fb99e5d92a4cec89008a8f99baf9 +DIST gcc-11-20230713.tar.xz 76215136 BLAKE2B 6972eb897aa11245f9eb8000d4731f37cf14f3bf75b433a322fece1308403ba1359dd0d96a3e1e2dfc7d94343a0bf1c917d3663b9e34424f379329b6fe85ed33 SHA512 fd16be7fb803154f4d6e374d373bc40d7f41afcda7a7bac77e943d66434d4c8a19470a51c3cf68b1d501eaa346abf8516762a085d688babc37f27fbba168209e DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17 diff --git a/sys-devel/gcc/gcc-11.4.1_p20230713.ebuild b/sys-devel/gcc/gcc-11.4.1_p20230713.ebuild new file mode 100644 index 000000000000..02c58f02f0a6 --- /dev/null +++ b/sys-devel/gcc/gcc-11.4.1_p20230713.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="11.4.0" +PATCH_VER="10" +MUSL_VER="2" +MUSL_GCC_VER="11.4.0" + +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=">=${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 +}