Gentoo Archives: gentoo-dev

From: "Arsen Arsenović" <arsen@g.o>
To: gentoo-dev@l.g.o, toolchain@g.o
Cc: "Arsen Arsenović" <arsen@g.o>
Subject: [gentoo-dev] [PATCH] toolchain.eclass: Register the D tc_feature
Date: Thu, 09 Feb 2023 20:07:08
Message-Id: 20230209200429.2389477-1-arsen@gentoo.org
1 This behavior is relied on elsewhere, for setting BDEPENDs correctly.
2
3 Signed-off-by: Arsen Arsenović <arsen@g.o>
4 ---
5 Hi there,
6
7 I was trying to merge GDC, and noticed that the non-selfhost BDEPEND is
8 missing for GCC 13. Specifically, the following block was never
9 enterred:
10
11 # TODO: Add a pkg_setup & pkg_pretend check for whether the active compiler
12 # supports D.
13 if tc_has_feature d && tc_version_is_at_least 12.0 ; then
14 # D in 12+ is self-hosting and needs D to bootstrap.
15 # TODO: package some binary we can use, like for Ada
16 # bug #840182
17 BDEPEND+=" d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )"
18 fi
19
20 This change enables the correct dependency to be emitted.
21
22 eclass/toolchain.eclass | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
26 index 6d8901d21812..06c044fd1d38 100644
27 --- a/eclass/toolchain.eclass
28 +++ b/eclass/toolchain.eclass
29 @@ -1,4 +1,4 @@
30 -# Copyright 1999-2022 Gentoo Authors
31 +# Copyright 1999-2023 Gentoo Authors
32 # Distributed under the terms of the GNU General Public License v2
33
34 # @ECLASS: toolchain.eclass
35 @@ -271,7 +271,7 @@ if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] ; then
36 tc_version_is_at_least 8.0 &&
37 IUSE+=" systemtap" TC_FEATURES+=( systemtap )
38
39 - tc_version_is_at_least 9.0 && IUSE+=" d"
40 + tc_version_is_at_least 9.0 && IUSE+=" d" TC_FEATURES+=( d )
41 tc_version_is_at_least 9.1 && IUSE+=" lto"
42 tc_version_is_at_least 10 && IUSE+=" cet"
43 tc_version_is_at_least 10 && IUSE+=" zstd" TC_FEATURES+=( zstd )
44 --
45 2.39.1

Replies