From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1580356-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 E15B6158013 for <garchives@archives.gentoo.org>; Sat, 16 Dec 2023 03:42:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6137E2BC018; Sat, 16 Dec 2023 03:42:08 +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 39A4E2BC018 for <gentoo-commits@lists.gentoo.org>; Sat, 16 Dec 2023 03:42:08 +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 257F9335D77 for <gentoo-commits@lists.gentoo.org>; Sat, 16 Dec 2023 03:42:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EF46AE9 for <gentoo-commits@lists.gentoo.org>; Sat, 16 Dec 2023 03:42: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: <1702697958.3fd84f6775ca068ad178e2f3a94fe445ec1a5948.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_p20231214.ebuild X-VCS-Directories: sys-devel/gcc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3fd84f6775ca068ad178e2f3a94fe445ec1a5948 X-VCS-Branch: master Date: Sat, 16 Dec 2023 03:42: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: 1923dd1b-48e2-48be-b90e-161dd08f0169 X-Archives-Hash: 8827d1a3fc008567c394dc8dc9c16b78 commit: 3fd84f6775ca068ad178e2f3a94fe445ec1a5948 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 16 03:39:18 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 16 03:39:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd84f67 sys-devel/gcc: add 11.4.1_p20231214 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 1 + sys-devel/gcc/gcc-11.4.1_p20231214.ebuild | 64 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 2b747014702c..eb2059ed6429 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -7,6 +7,7 @@ DIST gcc-11-20231116.tar.xz 76229556 BLAKE2B d86238ccc5f477316cf9b24f85335e2eaef DIST gcc-11-20231123.tar.xz 76227160 BLAKE2B 20fb3d3ec58c0c78a795ffbd154d76b203670f16b1a8c8eac4d17b4b2abd09e2def944c7765582889d7c79934a35c5852db8b0713bac8a3254df86eabce55a6a SHA512 49db02156afb5005822080a00172801ea1f3e62ae26eabf2edc9033c9577bc529adb8c9e259bb3e23d075741ff9074b6b1f33c158cdd60b7b23760e64f3f5c58 DIST gcc-11-20231130.tar.xz 76233368 BLAKE2B c5675854585458e94b743eb98f6cf43b72f672fb2cdbd2f185b411f8943f70fff97f5613863bbe6a9eb85d4d8469ee13f2c0a601540c791dc249e2bd5e6f9373 SHA512 c1e611e2dee35448ff162c0be32a67937db45535e2f93c3fc7bfbb24dd57e2cd6bf840b47cc8d60183e5aec9ff87de56e85ddf491b3304307ca584e911d1b1f0 DIST gcc-11-20231207.tar.xz 76225664 BLAKE2B a5e8391a23b5f8769b49f64a92f770b591990d9e2c2cc2b32bbb75f4342144a99cd9880e1e364b55fbfcc8b511a56ff68e2463f7588a4e5593059fbb784a24bf SHA512 2359e2fb379a5573ddd05b9cdea1c3d7fd531014d436f32ed49c8cd8b830c722b7a4e03b2c51d871c880795762df70aeb9d9ebde0f05fd74483e75e89e80fefb +DIST gcc-11-20231214.tar.xz 76228348 BLAKE2B fded6ed91e9376d23652490f6b36cf847d1e01c449a26f756a7aee753dd82af37e3583f0cdae3c987923bb8938ed5a199db2b9a7a0c7fe7c8ceb6c8046029c4a SHA512 4e7a644fcd6c51d82b7b4fea368f0c26a887ccc694cddc0ca80af8dad289fe05f92b8036403075e62302a03f6f93a41291e2e925dd6f63e738772ea8f67b432a 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-11.tar.xz 14268 BLAKE2B 7650366a8ff48855efb7ff7e7e61b2ccada669f95154bb176d6422fb6d2da3c3f332987338164350295683687283004733dae90ef5e0a11fb0803b0e37e1dfad SHA512 707f741977de0f13abf45e90595ecfbdcd6a94d0583a7568a69333d5a717d3f82a08c1c1b695cdbf956b1eea3b6d325fdb27bba4b931216c03f591684d93b959 diff --git a/sys-devel/gcc/gcc-11.4.1_p20231214.ebuild b/sys-devel/gcc/gcc-11.4.1_p20231214.ebuild new file mode 100644 index 000000000000..0a84d9888218 --- /dev/null +++ b/sys-devel/gcc/gcc-11.4.1_p20231214.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="12" +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 +}