commit: 0d89c6123fc708ea2e215bd6802d0760752ba699
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 07:38:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 07:39:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d89c612
sys-devel/gcc: sync 13.x with live
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/gcc/gcc-13.1.1_p20230520.ebuild | 22 ++++++++++++----------
sys-devel/gcc/gcc-13.1.1_p20230527.ebuild | 22 ++++++++++++----------
sys-devel/gcc/gcc-13.1.1_p20230603.ebuild | 25 ++++++++++++++-----------
3 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild
b/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild
index 27d10044298b..107baf7d2d92 100644
--- a/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild
+++ b/sys-devel/gcc/gcc-13.1.1_p20230520.ebuild
@@ -4,21 +4,23 @@
EAPI=8
TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="3"
PATCH_GCC_VER="13.2.0"
+PATCH_VER="3"
MUSL_VER="2"
MUSL_GCC_VER="13.2.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)
@@ -30,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
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild
b/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild
index 27d10044298b..107baf7d2d92 100644
--- a/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild
+++ b/sys-devel/gcc/gcc-13.1.1_p20230527.ebuild
@@ -4,21 +4,23 @@
EAPI=8
TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="3"
PATCH_GCC_VER="13.2.0"
+PATCH_VER="3"
MUSL_VER="2"
MUSL_GCC_VER="13.2.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)
@@ -30,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
diff --git a/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild
b/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild
index 8ad60ea96784..994717045fb5 100644
--- a/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild
+++ b/sys-devel/gcc/gcc-13.1.1_p20230603.ebuild
@@ -4,21 +4,23 @@
EAPI=8
TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="3"
PATCH_GCC_VER="13.2.0"
+PATCH_VER="3"
MUSL_VER="2"
MUSL_GCC_VER="13.2.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)
@@ -30,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.
