sys-devel/gcc: CET support needs glibc[cet] if enabled

We'll probably revbump with these fixes (or a slightly later
gcc snapshot) shortly, but not doing it just yet.

Bug: https://bugs.gentoo.org/830454
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-01-07 00:36:10 +00:00
parent c159caed31
commit a0c6762824
3 changed files with 8 additions and 7 deletions

View File

@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
# 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.
# bug #830454
RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet] ) )"
BDEPEND="${CATEGORY}/binutils"
RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )"
BDEPEND="${CATEGORY}/binutils[cet(-)?]"
src_prepare() {
toolchain_src_prepare

View File

@@ -15,8 +15,8 @@ inherit toolchain
# 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.
# bug #830454
RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet] ) )"
BDEPEND="${CATEGORY}/binutils"
RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )"
BDEPEND="${CATEGORY}/binutils[cet(-)?]"
src_prepare() {
local p upstreamed_patches=(

View File

@@ -11,13 +11,14 @@ MUSL_GCC_VER="11.2.0"
EGIT_BRANCH=master
inherit toolchain
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
# Don't keyword live ebuilds
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
# 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.
# bug #830454
RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet] ) )"
BDEPEND="${CATEGORY}/binutils"
RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )"
BDEPEND="${CATEGORY}/binutils[cet(-)?]"
src_prepare() {
local p upstreamed_patches=(