From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1715668-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 F05E4158B20
for <garchives@archives.gentoo.org>; Fri, 07 Feb 2025 18:04:53 +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 B91B1343028
for <garchives@archives.gentoo.org>; Fri, 07 Feb 2025 18:04:53 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id A5D731103CB;
Fri, 07 Feb 2025 18:04:52 +0000 (UTC)
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 bobolink.gentoo.org (Postfix) with ESMTPS id 9897B1103CB
for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 18:04:52 +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 40600342FA2
for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 18:04:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B490E65
for <gentoo-commits@lists.gentoo.org>; Fri, 07 Feb 2025 18:04:50 +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: <1738951451.672b4e16d50c895f63ed0dffd13b127735adaa89.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: 672b4e16d50c895f63ed0dffd13b127735adaa89
X-VCS-Branch: master
Date: Fri, 07 Feb 2025 18:04:50 +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: 39c1686d-49db-4f42-8acd-6ae7a7ea6ab2
X-Archives-Hash: e2ce35ca6faac12a0994bece8e3888d5
commit: 672b4e16d50c895f63ed0dffd13b127735adaa89
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 18:01:22 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 18:04:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=672b4e16
toolchain.eclass: depend on doxygen for USE=doc
Needed for libstdc++ docs.
This goes back to 3998c0e241690b9f5520a66c36382d6173c2bdad and
337957a79e26b67eda2ef3bd5af71f75217b32b5. I don't see why we want
that behaviour these days.
Closes: https://bugs.gentoo.org/949398
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain.eclass | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index f203e32a0450..153018607a02 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -373,6 +373,7 @@ BDEPEND="
app-alternatives/yacc
sys-devel/binutils:*
>=sys-devel/flex-2.5.4
+ doc? ( app-text/doxygen )
nls? ( sys-devel/gettext )
test? (
${PYTHON_DEPS}
@@ -2348,21 +2349,17 @@ gcc_do_make() {
emake "${emakeargs[@]}" ${GCC_MAKE_TARGET}
if ! is_crosscompile && _tc_use_if_iuse cxx && _tc_use_if_iuse doc ; then
- if type -p doxygen > /dev/null ; then
- cd "${CTARGET}"/libstdc++-v3/doc || die
- emake doc-man-doxygen
-
- # Clean bogus manpages. bug #113902
- find -name '*_build_*' -delete || die
-
- # Blow away generated directory references. Newer versions of gcc
- # have gotten better at this, but not perfect. This is easier than
- # backporting all of the various doxygen patches. bug #486754
- find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \
- xargs rm -f
- else
- ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed"
- fi
+ cd "${CTARGET}"/libstdc++-v3/doc || die
+ emake doc-man-doxygen
+
+ # Clean bogus manpages. bug #113902
+ find -name '*_build_*' -delete || die
+
+ # Blow away generated directory references. Newer versions of gcc
+ # have gotten better at this, but not perfect. This is easier than
+ # backporting all of the various doxygen patches. bug #486754
+ find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \
+ xargs rm -f
fi
popd >/dev/null || die