From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1583039-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 770B4158015 for <garchives@archives.gentoo.org>; Sat, 23 Dec 2023 18:10:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 923442BC082; Sat, 23 Dec 2023 18:10:06 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72A352BC082 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2023 18:10:06 +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 6EA01342FFA for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2023 18:10:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD5731492 for <gentoo-commits@lists.gentoo.org>; Sat, 23 Dec 2023 18:10:02 +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: <1703354876.3a83a3895da6263e66dcd9f60d881bf2f88b1fb2.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-12.3.1_p20231222.ebuild X-VCS-Directories: sys-devel/gcc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3a83a3895da6263e66dcd9f60d881bf2f88b1fb2 X-VCS-Branch: master Date: Sat, 23 Dec 2023 18:10:02 +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: 4207e8c5-4da8-4017-b16e-f20eacf94de0 X-Archives-Hash: a46070fe3f6585cd76a8c48421b3c2a9 commit: 3a83a3895da6263e66dcd9f60d881bf2f88b1fb2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 23 18:07:56 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 23 18:07:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a83a389 sys-devel/gcc: add 12.3.1_p20231222 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/Manifest | 1 + sys-devel/gcc/gcc-12.3.1_p20231222.ebuild | 64 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index b316e0399cf5..13c9590f095b 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -19,6 +19,7 @@ DIST gcc-12-20231124.tar.xz 79820140 BLAKE2B 8a4ea2e35955d72d6b87c3f352d2fadc859 DIST gcc-12-20231201.tar.xz 79793864 BLAKE2B b5c19bb9cb5c03138f20baa1d199f8784ddf52980a30d8c22a69a4e7885d976da9b94f139c6d82fc520c033ee29992e3aabb23c8508c6b1a8913ec3d89b2db51 SHA512 c17383259cbf7bda6b10be954430676846cc443e0d83309dbe4e2f5b4ea53006c6d7cb1ce3d564a2a5d5b773af59cf2a0c7ce7f82cfd8da71060be233d7a986f DIST gcc-12-20231208.tar.xz 79805176 BLAKE2B 6c280bafb849a59d68f77b52703686967230eb7ee56628160a955dfd45c32c2c7492f0f2eebdfe9985b96b670615e6e01af103d9f4c033245a0c699b6c8c3a18 SHA512 b53a83f13b2583466b135e4bbf868a59970ec17f779b1b333ce45e506380308a439ea2a8e1e9adc10c777ef1f6498c8011f3a340e90c326e9e323d908bf1abdf DIST gcc-12-20231215.tar.xz 79804016 BLAKE2B 547def0a166db31d8654a8b85ec1320f0dfe30f3f340968a67761e7907f56eb135d5a7e28c582d74dabc835027e09eb282c2f01a7be1e830f5f73145739a3084 SHA512 72a0d0721c9d09b6afaf8f6214dec1a577debf0167569166f0fc7c808d90bece35bb088f810b36dc873cbf199b1ae91d5c64e1d6557c92abbf6cf3feb6fbcbfa +DIST gcc-12-20231222.tar.xz 79814136 BLAKE2B b50d336adb38d4c45d4097cc8772246d75646e2a3731af65c0b58eb1289508c4e08227eed15b6b1e88843b94933fd241388e5c634ecaa0cf432fc3d4fc71e618 SHA512 78886eb891ed89d9047e12222d7211e4c4e184554c8ce71274314f42afd2c573b8e4a512dab4d013aa26332e02cd1bf90b56607a0437a912d6e0bc2a096ea52f DIST gcc-12.3.0-musl-patches-1.tar.xz 3572 BLAKE2B c7bf65f7c9ea8023ddaac821ee2b778622fa310ac72a72b2f7032494a8f304eac86217f9204622e6c21aaef9952bece0d09bc126facd4f42b602927909815ab5 SHA512 babc279fea2c1fd4c018815f2f5630214fd46015ce9f365c28af242681d51818eaca30ce298eddcab1eed5ac5f2759e2b47b2335afab9d722b4469a6d4fec326 DIST gcc-12.3.0-patches-2.tar.xz 14236 BLAKE2B 06c43662c9abb0fa3cf90d5e2273c69aecb9158e6cf6f23c04754ed5d686be2616e81e2502eb16f4298ddd50518ca7677e13249da9e9b091162d3931ff65e4fe SHA512 b0d4b85dbf1a54aaaa1997203b872e3106906b4ad49cde57e1428bc22b2f8e2d73b8cb10ae0d0b792aebaf664594da4d1dea04c44ddc34e59047410766db04d1 DIST gcc-13-20230826.tar.xz 84285788 BLAKE2B c25be594e322dd7145245c42ae21b98aa9e3e6ae69f1fa313830e40bf2e8fcb8435762f1c9d3f1ca1dbf31653bdc76a658bec708b7850fe40a7c55504ac30618 SHA512 3d47632e90651bd50a881c727c1ef2aa3322b4fc3e082919ae430270901abf8a05a34fe93f8b678c10dc9a0758f93dc3b33ed5947c8743dab453d2b50c063722 diff --git a/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild b/sys-devel/gcc/gcc-12.3.1_p20231222.ebuild new file mode 100644 index 000000000000..1ffe2b97a4bf --- /dev/null +++ b/sys-devel/gcc/gcc-12.3.1_p20231222.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="12.3.0" +PATCH_VER="2" +MUSL_VER="1" +MUSL_GCC_VER="12.3.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 +}