commit: b276e4bcca9be91c5035adb9c0d99c595ebb802b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 21:59:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 21:59:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b276e4bc
sys-devel/gcc: don't set *DEPEND for cross builds
We don't always want Binutils for cross.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/gcc/gcc-11.3.1_p20221209.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-11.3.1_p20230303.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-11.3.1_p20230310.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-11.3.1_p20230317.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-11.4.9999.ebuild | 16 +++++++++-------
sys-devel/gcc/gcc-12.2.0.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-12.2.1_p20230304.ebuild | 15 ++++++++-------
sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-12.2.1_p20230318.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-12.3.9999.ebuild | 16 +++++++++-------
sys-devel/gcc/gcc-13.0.1.9999.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild | 14 ++++++++------
sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild | 14 ++++++++------
17 files changed, 138 insertions(+), 105 deletions(-)
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
index f947b7097d30..4aaa59aed4eb 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
@@ -31,12 +31,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
index 877d1c2ecf87..f49632bfbee5 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230120-r1.ebuild
@@ -31,12 +31,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
~riscv ~s390 sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
b/sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
index b21f06c867a2..15eaa58a13ce 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230303.ebuild
@@ -31,12 +31,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230310.ebuild
b/sys-devel/gcc/gcc-11.3.1_p20230310.ebuild
index 371a6269fe63..a30fa066e31c 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20230310.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230310.ebuild
@@ -31,12 +31,14 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
#fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
b/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
index 371a6269fe63..a30fa066e31c 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20230317.ebuild
@@ -31,12 +31,14 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
#fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-11.4.9999.ebuild
b/sys-devel/gcc/gcc-11.4.9999.ebuild
index de29705ca377..f693ec815844 100644
--- a/sys-devel/gcc/gcc-11.4.9999.ebuild
+++ b/sys-devel/gcc/gcc-11.4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,12 +29,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-12.2.0.ebuild b/sys-devel/gcc/gcc-12.2.0.ebuild
index 3b7175fe4ae0..3571393fd1f3 100644
--- a/sys-devel/gcc/gcc-12.2.0.ebuild
+++ b/sys-devel/gcc/gcc-12.2.0.ebuild
@@ -38,12 +38,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
index fff578a4285b..18679bf9338f 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230121-r1.ebuild
@@ -38,12 +38,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
ppc64 ~riscv ~s390 sparc x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
b/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
index 3924d524ff38..6dc3671605fe 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230304.ebuild
@@ -38,13 +38,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
-
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
b/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
index cb82e2228437..763aa90c2051 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230311-r1.ebuild
@@ -38,12 +38,14 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
#fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
b/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
index cb82e2228437..763aa90c2051 100644
--- a/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
+++ b/sys-devel/gcc/gcc-12.2.1_p20230318.ebuild
@@ -38,12 +38,14 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
#fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.3.9999.ebuild
b/sys-devel/gcc/gcc-12.3.9999.ebuild
index 914addefed5a..bf3196502bb1 100644
--- a/sys-devel/gcc/gcc-12.3.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -36,12 +36,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-13.0.1.9999.ebuild
b/sys-devel/gcc/gcc-13.0.1.9999.ebuild
index ca9d13f5ddf7..3949e79bd0cb 100644
--- a/sys-devel/gcc/gcc-13.0.1.9999.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1.9999.ebuild
@@ -30,12 +30,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild
b/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild
index 6b843430b057..639814d14c9c 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230226.ebuild
@@ -33,12 +33,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~loong"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild
b/sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild
index 6b843430b057..639814d14c9c 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230305.ebuild
@@ -33,12 +33,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~loong"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
b/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
index 1f65b8ba8aab..f476227f8198 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230312-r1.ebuild
@@ -33,12 +33,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~loong"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild
b/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild
index 1f65b8ba8aab..f476227f8198 100644
--- a/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230319.ebuild
@@ -33,12 +33,14 @@ if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ;
then
KEYWORDS="~loong"
fi
-# 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? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+if [[ ${CATEGORY} != cross-* ]] ; then
+ # 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? ( sys-libs/glibc[cet(-)?] )"
+ DEPEND="${RDEPEND}"
+ BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
src_prepare() {
local p upstreamed_patches=(
