summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-06-03 03:29:47 +0100
committerSam James <sam@gentoo.org>2022-06-03 03:29:47 +0100
commitf498a9ec26f3d7d9c369b563ca7eda2822663a44 (patch)
tree68aed4dea2979fcb497529229181bab21ad9f6af /sys-devel
parentsys-devel/gcc: add 10.3.1_p20220602 (diff)
downloadgentoo-f498a9ec26f3d7d9c369b563ca7eda2822663a44.tar.gz
gentoo-f498a9ec26f3d7d9c369b563ca7eda2822663a44.tar.bz2
gentoo-f498a9ec26f3d7d9c369b563ca7eda2822663a44.zip
sys-devel/gcc: cleanup KEYWORDS guards
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc/gcc-10.3.1_p20220526.ebuild4
-rw-r--r--sys-devel/gcc/gcc-10.3.1_p20220602.ebuild4
-rw-r--r--sys-devel/gcc/gcc-11.3.1_p20220527.ebuild5
-rw-r--r--sys-devel/gcc/gcc-12.1.0.ebuild7
4 files changed, 15 insertions, 5 deletions
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild
index 126a2d87af1b..a96b87526403 100644
--- a/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild
+++ b/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild
@@ -27,7 +27,9 @@ inherit toolchain
EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# Don't keyword live ebuilds
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild
index 126a2d87af1b..a96b87526403 100644
--- a/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild
+++ b/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild
@@ -27,7 +27,9 @@ inherit toolchain
EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# Don't keyword live ebuilds
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
RDEPEND=""
BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
index 9124fce642c9..66746a359bd7 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
@@ -26,7 +26,10 @@ inherit toolchain
# Needs to be after inherit (for now?), bug #830908
EGIT_BRANCH=releases/gcc-$(ver_cut 1)
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
# 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.
diff --git a/sys-devel/gcc/gcc-12.1.0.ebuild b/sys-devel/gcc/gcc-12.1.0.ebuild
index a3ed5cb44f85..d2fce9d32825 100644
--- a/sys-devel/gcc/gcc-12.1.0.ebuild
+++ b/sys-devel/gcc/gcc-12.1.0.ebuild
@@ -11,8 +11,11 @@ MUSL_GCC_VER="12.0.0"
inherit toolchain
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-KEYWORDS="~loong"
+# 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"
+ KEYWORDS="~loong"
+fi
# 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.