From 3d00647fec2600e217d690a64ba45a41f1a2fa0c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Jun 2023 09:50:45 +0100 Subject: gentoo auto-resync : 10:06:2023 - 09:50:45 --- sys-devel/gcc/gcc-11.4.0.ebuild | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'sys-devel/gcc/gcc-11.4.0.ebuild') diff --git a/sys-devel/gcc/gcc-11.4.0.ebuild b/sys-devel/gcc/gcc-11.4.0.ebuild index a43b016c3fc3..791c932e6fb5 100644 --- a/sys-devel/gcc/gcc-11.4.0.ebuild +++ b/sys-devel/gcc/gcc-11.4.0.ebuild @@ -3,31 +3,40 @@ EAPI=8 -TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" -PATCH_VER="10" PATCH_GCC_VER="11.4.0" +PATCH_VER="10" MUSL_VER="2" MUSL_GCC_VER="11.4.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="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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi -- cgit v1.2.3