| 1 |
commit: ac1a83da759184984512e1becf8eb9cbc129c157 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 7 00:42:36 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 7 00:42:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1a83da |
| 7 |
|
| 8 |
sys-devel/gcc: tweak/simplify *DEPEND |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/830454 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-devel/gcc/gcc-11.2.1_p20211127.ebuild | 3 ++- |
| 14 |
sys-devel/gcc/gcc-11.2.1_pre9999.ebuild | 3 ++- |
| 15 |
sys-devel/gcc/gcc-12.0.0_pre9999.ebuild | 3 ++- |
| 16 |
3 files changed, 6 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild |
| 19 |
index 1f30179859b2..cf332f7e6ce2 100644 |
| 20 |
--- a/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild |
| 21 |
+++ b/sys-devel/gcc/gcc-11.2.1_p20211127.ebuild |
| 22 |
@@ -15,7 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~ |
| 23 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
| 24 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
| 25 |
# bug #830454 |
| 26 |
-RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )" |
| 27 |
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" |
| 28 |
+DEPEND="${RDEPEND}" |
| 29 |
BDEPEND="${CATEGORY}/binutils[cet(-)?]" |
| 30 |
|
| 31 |
src_prepare() { |
| 32 |
|
| 33 |
diff --git a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild |
| 34 |
index 9e33ba672b19..b17d87e21b4f 100644 |
| 35 |
--- a/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild |
| 36 |
+++ b/sys-devel/gcc/gcc-11.2.1_pre9999.ebuild |
| 37 |
@@ -15,7 +15,8 @@ inherit toolchain |
| 38 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
| 39 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
| 40 |
# bug #830454 |
| 41 |
-RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )" |
| 42 |
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" |
| 43 |
+DEPEND="${RDEPEND}" |
| 44 |
BDEPEND="${CATEGORY}/binutils[cet(-)?]" |
| 45 |
|
| 46 |
src_prepare() { |
| 47 |
|
| 48 |
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild |
| 49 |
index d652a650041e..3571c4605330 100644 |
| 50 |
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild |
| 51 |
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild |
| 52 |
@@ -17,7 +17,8 @@ inherit toolchain |
| 53 |
# Technically only if USE=hardened *too* right now, but no point in complicating it further. |
| 54 |
# If GCC is enabling CET by default, we need glibc to be built with support for it. |
| 55 |
# bug #830454 |
| 56 |
-RDEPEND="elibc_glibc? ( cet? ( sys-libs/glibc[cet(-)] ) )" |
| 57 |
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" |
| 58 |
+DEPEND="${RDEPEND}" |
| 59 |
BDEPEND="${CATEGORY}/binutils[cet(-)?]" |
| 60 |
|
| 61 |
src_prepare() { |
Archives