commit: a0c6762824e9e51b962a9ca0385448c7b08093f7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 7 00:36:10 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 7 00:40:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0c67628
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 <AT> gentoo.org> sys-devel/gcc/gcc-11.2.1_p20211127.ebuild | 4 ++-- sys-devel/gcc/gcc-11.2.1_pre9999.ebuild | 4 ++-- sys-devel/gcc/gcc-12.0.0_pre9999.ebuild | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild index 33ab5e2a5247..1f30179859b2 100644 --- a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild +++ b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild @@ -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 diff --git a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild index 3cd99510965f..9e33ba672b19 100644 --- a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild +++ b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild @@ -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=( diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild index af8380e0436e..d652a650041e 100644 --- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild +++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild @@ -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=(
