| 1 |
commit: a0c6762824e9e51b962a9ca0385448c7b08093f7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 7 00:36:10 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 7 00:40:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0c67628 |
| 7 |
|
| 8 |
sys-devel/gcc: CET support needs glibc[cet] if enabled |
| 9 |
|
| 10 |
We'll probably revbump with these fixes (or a slightly later |
| 11 |
gcc snapshot) shortly, but not doing it just yet. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/830454 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-devel/gcc/gcc-11.2.1_p20211127.ebuild | 4 ++-- |
| 17 |
sys-devel/gcc/gcc-11.2.1_pre9999.ebuild | 4 ++-- |
| 18 |
sys-devel/gcc/gcc-12.0.0_pre9999.ebuild | 7 ++++--- |
| 19 |
3 files changed, 8 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild |
| 22 |
index 33ab5e2a5247..1f30179859b2 100644 |
| 23 |
--- a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild |
| 24 |
+++ b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild |
| 25 |
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ |
| 26 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
| 27 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
| 28 |
# bug #830454 |
| 29 |
-RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet] ) )" |
| 30 |
-BDEPEND="${CATEGORY}/binutils" |
| 31 |
+RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )" |
| 32 |
+BDEPEND="${CATEGORY}/binutils[cet(-)?]" |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
toolchain_src_prepare |
| 36 |
|
| 37 |
diff --git a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild |
| 38 |
index 3cd99510965f..9e33ba672b19 100644 |
| 39 |
--- a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild |
| 40 |
+++ b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild |
| 41 |
@@ -15,8 +15,8 @@ inherit toolchain |
| 42 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
| 43 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
| 44 |
# bug #830454 |
| 45 |
-RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet] ) )" |
| 46 |
-BDEPEND="${CATEGORY}/binutils" |
| 47 |
+RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )" |
| 48 |
+BDEPEND="${CATEGORY}/binutils[cet(-)?]" |
| 49 |
|
| 50 |
src_prepare() { |
| 51 |
local p upstreamed_patches=( |
| 52 |
|
| 53 |
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild |
| 54 |
index af8380e0436e..d652a650041e 100644 |
| 55 |
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild |
| 56 |
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild |
| 57 |
@@ -11,13 +11,14 @@ MUSL_GCC_VER="11.2.0" |
| 58 |
EGIT_BRANCH=master |
| 59 |
inherit toolchain |
| 60 |
|
| 61 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 62 |
+# Don't keyword live ebuilds |
| 63 |
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
| 64 |
|
| 65 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
| 66 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
| 67 |
# bug #830454 |
| 68 |
-RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet] ) )" |
| 69 |
-BDEPEND="${CATEGORY}/binutils" |
| 70 |
+RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )" |
| 71 |
+BDEPEND="${CATEGORY}/binutils[cet(-)?]" |
| 72 |
|
| 73 |
src_prepare() { |
| 74 |
local p upstreamed_patches=( |
Archives