1 |
commit: f498a9ec26f3d7d9c369b563ca7eda2822663a44 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 3 02:29:47 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 3 02:29:47 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f498a9ec |
7 |
|
8 |
sys-devel/gcc: cleanup KEYWORDS guards |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sys-devel/gcc/gcc-10.3.1_p20220526.ebuild | 4 +++- |
13 |
sys-devel/gcc/gcc-10.3.1_p20220602.ebuild | 4 +++- |
14 |
sys-devel/gcc/gcc-11.3.1_p20220527.ebuild | 5 ++++- |
15 |
sys-devel/gcc/gcc-12.1.0.ebuild | 7 +++++-- |
16 |
4 files changed, 15 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild |
19 |
index 126a2d87af1b..a96b87526403 100644 |
20 |
--- a/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild |
21 |
+++ b/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild |
22 |
@@ -27,7 +27,9 @@ inherit toolchain |
23 |
EGIT_BRANCH=releases/gcc-$(ver_cut 1) |
24 |
|
25 |
# Don't keyword live ebuilds |
26 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
27 |
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then |
28 |
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
29 |
+#fi |
30 |
|
31 |
RDEPEND="" |
32 |
BDEPEND="${CATEGORY}/binutils" |
33 |
|
34 |
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild |
35 |
index 126a2d87af1b..a96b87526403 100644 |
36 |
--- a/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild |
37 |
+++ b/sys-devel/gcc/gcc-10.3.1_p20220602.ebuild |
38 |
@@ -27,7 +27,9 @@ inherit toolchain |
39 |
EGIT_BRANCH=releases/gcc-$(ver_cut 1) |
40 |
|
41 |
# Don't keyword live ebuilds |
42 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
43 |
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then |
44 |
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
45 |
+#fi |
46 |
|
47 |
RDEPEND="" |
48 |
BDEPEND="${CATEGORY}/binutils" |
49 |
|
50 |
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild |
51 |
index 9124fce642c9..66746a359bd7 100644 |
52 |
--- a/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild |
53 |
+++ b/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild |
54 |
@@ -26,7 +26,10 @@ inherit toolchain |
55 |
# Needs to be after inherit (for now?), bug #830908 |
56 |
EGIT_BRANCH=releases/gcc-$(ver_cut 1) |
57 |
|
58 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
59 |
+# Don't keyword live ebuilds |
60 |
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then |
61 |
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
62 |
+#fi |
63 |
|
64 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
65 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
66 |
|
67 |
diff --git a/sys-devel/gcc/gcc-12.1.0.ebuild b/sys-devel/gcc/gcc-12.1.0.ebuild |
68 |
index a3ed5cb44f85..d2fce9d32825 100644 |
69 |
--- a/sys-devel/gcc/gcc-12.1.0.ebuild |
70 |
+++ b/sys-devel/gcc/gcc-12.1.0.ebuild |
71 |
@@ -11,8 +11,11 @@ MUSL_GCC_VER="12.0.0" |
72 |
|
73 |
inherit toolchain |
74 |
|
75 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
76 |
-KEYWORDS="~loong" |
77 |
+# Don't keyword live ebuilds |
78 |
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then |
79 |
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
80 |
+ KEYWORDS="~loong" |
81 |
+fi |
82 |
|
83 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
84 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |