From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1715675-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id E36DF158B20
for <garchives@archives.gentoo.org>; Fri, 07 Feb 2025 18:33:44 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id CBD53342F9E
for <garchives@archives.gentoo.org>; Fri, 07 Feb 2025 18:33:44 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id B745E1103CB;
Fri, 07 Feb 2025 18:33:43 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id AFA951103CB
for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 18:33:43 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 63C763417BD
for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 18:33:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BCD36268A
for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 18:33:41 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1738953204.5837f60b82e256c6321fe741c75a3d0933875def.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/toolchain.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 5837f60b82e256c6321fe741c75a3d0933875def
X-VCS-Branch: master
Date: Fri, 07 Feb 2025 18:33:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dc6cba5b-a6d3-4c91-83cb-076bbf073a2d
X-Archives-Hash: 9e030f53d909f590062653baa7cd4cae
commit: 5837f60b82e256c6321fe741c75a3d0933875def
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 18:32:57 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 18:33:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5837f60b
toolchain.eclass: fix USE=doc for non-gcc (kgcc64)
We can simplify the has_feature ... && _use_if ... later.
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 153018607a02..205c0e5314db 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -299,7 +299,8 @@ tc_has_feature() {
if [[ ${PN} != kgcc64 && ${PN} != gcc-* ]] ; then
IUSE+=" debug +cxx"
IUSE+=" +fortran" TC_FEATURES+=( fortran )
- IUSE+=" doc hardened multilib objc"
+ IUSE+=" doc" TC_FEATURES+=( doc )
+ IUSE+=" hardened multilib objc"
IUSE+=" pgo"
IUSE+=" objc-gc" TC_FEATURES+=( objc-gc )
IUSE+=" libssp objc++"
@@ -373,7 +374,6 @@ BDEPEND="
app-alternatives/yacc
sys-devel/binutils:*
>=sys-devel/flex-2.5.4
- doc? ( app-text/doxygen )
nls? ( sys-devel/gettext )
test? (
${PYTHON_DEPS}
@@ -381,6 +381,11 @@ BDEPEND="
>=sys-devel/autogen-5.5.4
)
"
+
+if tc_has_feature doc ; then
+ BDEPEND+=" doc? ( app-text/doxygen )"
+fi
+
DEPEND="${RDEPEND}"
if [[ ${PN} == gcc && ${PV} == *_p* ]] ; then
@@ -2348,7 +2353,7 @@ gcc_do_make() {
pushd "${WORKDIR}"/build >/dev/null || die
emake "${emakeargs[@]}" ${GCC_MAKE_TARGET}
- if ! is_crosscompile && _tc_use_if_iuse cxx && _tc_use_if_iuse doc ; then
+ if ! is_crosscompile && _tc_use_if_iuse cxx && tc_has_feature doc && _tc_use_if_iuse doc ; then
cd "${CTARGET}"/libstdc++-v3/doc || die
emake doc-man-doxygen