commit: ac1a83da759184984512e1becf8eb9cbc129c157 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jan 7 00:42:36 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 7 00:42:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1a83da
sys-devel/gcc: tweak/simplify *DEPEND Bug: https://bugs.gentoo.org/830454 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/gcc/gcc-11.2.1_p20211127.ebuild | 3 ++- sys-devel/gcc/gcc-11.2.1_pre9999.ebuild | 3 ++- sys-devel/gcc/gcc-12.0.0_pre9999.ebuild | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild index 1f30179859b2..cf332f7e6ce2 100644 --- a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild +++ b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild @@ -15,7 +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(-)] ) )" +RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" +DEPEND="${RDEPEND}" BDEPEND="${CATEGORY}/binutils[cet(-)?]" 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 9e33ba672b19..b17d87e21b4f 100644 --- a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild +++ b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild @@ -15,7 +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(-)] ) )" +RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" +DEPEND="${RDEPEND}" BDEPEND="${CATEGORY}/binutils[cet(-)?]" src_prepare() { diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild index d652a650041e..3571c4605330 100644 --- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild +++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild @@ -17,7 +17,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(-)] ) )" +RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" +DEPEND="${RDEPEND}" BDEPEND="${CATEGORY}/binutils[cet(-)?]" src_prepare() {
