From patchwork Mon Jul 1 08:21:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Wilson X-Patchwork-Id: 1125127 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-504035-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="LY42DM8G"; dkim=pass (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="Uhww08Ih"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45cgMq35fBz9s00 for ; Mon, 1 Jul 2019 18:22:11 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; q=dns; s=default; b=eVa1UtAi0q8X WgwGfjFJzk/5BqWxuBPm/FG8nLv63r+BkRd1+I7fQbYr8B/7xaaJIiBL1v5IHooN DVlmjMyjMRbo7c/sPSuyHOSPd3DNcaQRdW5ffR0SmYF0UCYPFCDH5KqeCkCxEGFH 0Oywv+j2H8KjbZm1002mG2d+0eePUdY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id; s=default; bh=dR+eoy25CLxIh0iThV P/DtyQae4=; b=LY42DM8GPJfT599ZV5MTQHjPHNEJb1sy+vf5YNI7N6B9CfJ+QV woEv8ZOhRnNiWaZLyOMhDBcmxlJVNaVIDrqKyFicEePPO9RucijQKt1GwnqajZxm gjXadTtUwm7bSRZUcSBNyfe1VcAXL8OC7JyyUtybhAc1YgBNbp71ECDh8= Received: (qmail 118694 invoked by alias); 1 Jul 2019 08:21:57 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 117433 invoked by uid 89); 1 Jul 2019 08:21:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=doxygen, Doxygen, xml, H*RU:209.85.214.196 X-HELO: mail-pl1-f196.google.com Received: from mail-pl1-f196.google.com (HELO mail-pl1-f196.google.com) (209.85.214.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 01 Jul 2019 08:21:53 +0000 Received: by mail-pl1-f196.google.com with SMTP id k8so6952537plt.3 for ; Mon, 01 Jul 2019 01:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id; bh=AWFTxbwL79SJmJQkK5NI7bXlT1CjXUkEMV1i1H7HbHg=; b=Uhww08IhgB95xVM+XmPEvrryXqqUiMqhympqog/BTg02dHb//3R8HLo2911OusZiN9 ShYyLBSMCqXsyK3tNWo0tiU2dU6d/VN6sNLXU532noqe54JLNSAAzMZ/3XdVepIbdkKt t2dXZVdXaMsEwsvNe44ndCMoIl1+a/+3WEDVusVB/4spuHGmqltNpOUNQ1gF6zie37OS lGFwO98/wAv5+qiG0GQyPSmMvFJYi4BKmxG+3/HEdIo/+qVaOrZbLnmnvjZLO1kN5JJ1 1zrYa6gPnEwAKbaHagphhiQCgPGzAgS/keU8ee+fUGwZ4pueTJePEjen7SxKTUBte5ZM vJYQ== Received: from localhost.localdomain (220-132-236-182.HINET-IP.hinet.net. [220.132.236.182]) by smtp.gmail.com with ESMTPSA id cq4sm7333106pjb.23.2019.07.01.01.21.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 01 Jul 2019 01:21:51 -0700 (PDT) From: Jim Wilson To: libstdc++@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org, Jim Wilson Subject: [PATCH] Fix libstdc++ install-pdf support. Date: Mon, 1 Jul 2019 01:21:18 -0700 Message-Id: <20190701082118.18386-1-jimw@sifive.com> X-IsSubscribed: yes Try to run "make install-pdf" on a system with dblatex and pdflatex installed but not doxygen gives an error. run_doxygen error: Could not find Doxygen 1.7.0 in path. Looking at the build log, I see that this is also using xsltproc and xmllint. Installing doxygen and running again, I get lots of ignored errors for a missing dot program. Looking at the docs I see the collaboration diagrams are missing. Installing dot and rebuilding and now I have the collaboration diagrams. I don't see any evidence that the pdf docs are using the stylesheets. Otherwise, they need everything else that the xml docs need. Regenerating configure I got an unexpected change, but that is an issue with a patch a few days ago that added a new thread file, and regenerated the libgcc configure to use it, but failed to notice that the libstdc++ configure should have been regenerated too. Tested with x86_64-linux builds with various packages installed or removed, and looking at the final docs to make sure they look right. OK? Jim libstdc++-v3/ * configure.ac (BUILD_PDF): Also test for doxygen, dot, xsltproc, and xmllint. * configure: Regenerate. --- libstdc++-v3/configure | 21 +++++++++++++-------- libstdc++-v3/configure.ac | 4 ++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 62d9cb49acf..d06b0440cb5 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -15418,6 +15418,7 @@ $as_echo "$target_thread_file" >&6; } case $target_thread_file in aix) thread_header=config/rs6000/gthr-aix.h ;; dce) thread_header=config/pa/gthr-dce.h ;; + gcn) thread_header=config/gcn/gthr-gcn.h ;; lynx) thread_header=config/gthr-lynx.h ;; mipssde) thread_header=config/mips/gthr-mipssde.h ;; posix) thread_header=gthr-posix.h ;; @@ -15637,7 +15638,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15640 "configure" +#line 15641 "configure" int main() { typedef bool atomic_type; @@ -15672,7 +15673,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15675 "configure" +#line 15676 "configure" int main() { typedef short atomic_type; @@ -15707,7 +15708,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15710 "configure" +#line 15711 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15743,7 +15744,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15746 "configure" +#line 15747 "configure" int main() { typedef long long atomic_type; @@ -15896,7 +15897,7 @@ $as_echo "mutex" >&6; } # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15899 "configure" +#line 15900 "configure" int main() { _Decimal32 d1; @@ -15938,7 +15939,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15941 "configure" +#line 15942 "configure" template struct same { typedef T2 type; }; @@ -15972,7 +15973,7 @@ $as_echo "$enable_int128" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15975 "configure" +#line 15976 "configure" template struct same { typedef T2 type; }; @@ -81880,7 +81881,11 @@ $as_echo "no" >&6; } fi - if test $ac_cv_prog_DBLATEX = "yes" && + if test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes" && + test $ac_cv_prog_XSLTPROC = "yes" && + test $ac_cv_prog_XMLLINT = "yes" && + test $ac_cv_prog_DBLATEX = "yes" && test $ac_cv_prog_PDFLATEX = "yes"; then BUILD_PDF_TRUE= BUILD_PDF_FALSE='#' diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 2e3a1a98f33..80d8202c337 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -483,6 +483,10 @@ AM_CONDITIONAL(BUILD_MAN, AC_CHECK_PROG([DBLATEX], dblatex, yes, no) AC_CHECK_PROG([PDFLATEX], pdflatex, yes, no) AM_CONDITIONAL(BUILD_PDF, + test $ac_cv_prog_DOXYGEN = "yes" && + test $ac_cv_prog_DOT = "yes" && + test $ac_cv_prog_XSLTPROC = "yes" && + test $ac_cv_prog_XMLLINT = "yes" && test $ac_cv_prog_DBLATEX = "yes" && test $ac_cv_prog_PDFLATEX = "yes")