From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B5B6C15810F for ; Sat, 10 Jun 2023 07:42:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC236E0932; Sat, 10 Jun 2023 07:42:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D1442E0928 for ; Sat, 10 Jun 2023 07:42: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 CED3934111E for ; Sat, 10 Jun 2023 07:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23710A8E for ; Sat, 10 Jun 2023 07:42:04 +0000 (UTC) From: "Sam James" 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" Message-ID: <1686382771.eea41edf93851097a97786068395a95d25b7e0c6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild sys-devel/gcc/gcc-12.3.0.ebuild sys-devel/gcc/gcc-12.3.1_p20230526.ebuild sys-devel/gcc/gcc-12.3.1_p20230602.ebuild sys-devel/gcc/gcc-12.3.1_p20230609.ebuild X-VCS-Directories: sys-devel/gcc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eea41edf93851097a97786068395a95d25b7e0c6 X-VCS-Branch: master Date: Sat, 10 Jun 2023 07:42:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ba241ea-741e-44ea-868f-6c240a98c0be X-Archives-Hash: 8d5fae48e76800f333989bc37db23bfb commit: eea41edf93851097a97786068395a95d25b7e0c6 Author: Sam James gentoo org> AuthorDate: Sat Jun 10 07:36:26 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 10 07:39:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea41edf sys-devel/gcc: sync 12.x with live Signed-off-by: Sam James gentoo.org> sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild | 29 ++++++++++++++-------- sys-devel/gcc/gcc-12.3.0.ebuild | 33 +++++++++++++++---------- sys-devel/gcc/gcc-12.3.1_p20230526.ebuild | 33 +++++++++++++++---------- sys-devel/gcc/gcc-12.3.1_p20230602.ebuild | 36 +++++++++++++++++----------- sys-devel/gcc/gcc-12.3.1_p20230609.ebuild | 36 +++++++++++++++++----------- 5 files changed, 103 insertions(+), 64 deletions(-) diff --git a/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild index bba4e8fe97f7..82b358a57be4 100644 --- a/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild +++ b/sys-devel/gcc/gcc-12.2.1_p20230428-r1.ebuild @@ -4,37 +4,39 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" PATCH_GCC_VER="12.3.0" +PATCH_VER="2" MUSL_VER="1" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +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=$(($(ver_cut 2) - 1)) + 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}.$(($(ver_cut 3) - 9998)) + 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="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" TOOLCHAIN_SET_S=no S="${WORKDIR}"/${MY_P} fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +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 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86" fi @@ -48,6 +50,13 @@ if [[ ${CATEGORY} != cross-* ]] ; then 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 diff --git a/sys-devel/gcc/gcc-12.3.0.ebuild b/sys-devel/gcc/gcc-12.3.0.ebuild index 963e5466b141..eb2841b23665 100644 --- a/sys-devel/gcc/gcc-12.3.0.ebuild +++ b/sys-devel/gcc/gcc-12.3.0.ebuild @@ -4,26 +4,26 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" PATCH_GCC_VER="12.3.0" +PATCH_VER="2" MUSL_VER="1" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +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=$(($(ver_cut 2) - 1)) + 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}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then # Cheesy hack for RCs - # Sometimes the RCs are e.g. 12.3 and not 12.3.0... - #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) + 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 @@ -32,12 +32,12 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +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 @@ -50,6 +50,13 @@ if [[ ${CATEGORY} != cross-* ]] ; then 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 diff --git a/sys-devel/gcc/gcc-12.3.1_p20230526.ebuild b/sys-devel/gcc/gcc-12.3.1_p20230526.ebuild index 963e5466b141..eb2841b23665 100644 --- a/sys-devel/gcc/gcc-12.3.1_p20230526.ebuild +++ b/sys-devel/gcc/gcc-12.3.1_p20230526.ebuild @@ -4,26 +4,26 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" PATCH_GCC_VER="12.3.0" +PATCH_VER="2" MUSL_VER="1" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +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=$(($(ver_cut 2) - 1)) + 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}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then # Cheesy hack for RCs - # Sometimes the RCs are e.g. 12.3 and not 12.3.0... - #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) + 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 @@ -32,12 +32,12 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +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 @@ -50,6 +50,13 @@ if [[ ${CATEGORY} != cross-* ]] ; then 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 diff --git a/sys-devel/gcc/gcc-12.3.1_p20230602.ebuild b/sys-devel/gcc/gcc-12.3.1_p20230602.ebuild index 4e2eee4f27cd..1ffe2b97a4bf 100644 --- a/sys-devel/gcc/gcc-12.3.1_p20230602.ebuild +++ b/sys-devel/gcc/gcc-12.3.1_p20230602.ebuild @@ -4,26 +4,26 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" PATCH_GCC_VER="12.3.0" +PATCH_VER="2" MUSL_VER="1" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +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=$(($(ver_cut 2) - 1)) + 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}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then # Cheesy hack for RCs - # Sometimes the RCs are e.g. 12.3 and not 12.3.0... - #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) + 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 @@ -32,13 +32,14 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +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. @@ -50,6 +51,13 @@ if [[ ${CATEGORY} != cross-* ]] ; then 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 diff --git a/sys-devel/gcc/gcc-12.3.1_p20230609.ebuild b/sys-devel/gcc/gcc-12.3.1_p20230609.ebuild index 4e2eee4f27cd..1ffe2b97a4bf 100644 --- a/sys-devel/gcc/gcc-12.3.1_p20230609.ebuild +++ b/sys-devel/gcc/gcc-12.3.1_p20230609.ebuild @@ -4,26 +4,26 @@ EAPI=8 TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="2" PATCH_GCC_VER="12.3.0" +PATCH_VER="2" MUSL_VER="1" MUSL_GCC_VER="12.3.0" -if [[ $(ver_cut 3) == 9999 ]] ; then +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=$(($(ver_cut 2) - 1)) + 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}.$(($(ver_cut 3) - 9998)) + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then # Cheesy hack for RCs - # Sometimes the RCs are e.g. 12.3 and not 12.3.0... - #MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) - MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1)))-RC-$(ver_cut 5) + 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 @@ -32,13 +32,14 @@ fi inherit toolchain -# Needs to be after inherit (for now?), bug #830908 -EGIT_BRANCH=releases/gcc-$(ver_cut 1) - -# Don't keyword live ebuilds -#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then -# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -#fi +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. @@ -50,6 +51,13 @@ if [[ ${CATEGORY} != cross-* ]] ; then 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