From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id 760393858D39 for ; Tue, 19 Oct 2021 15:34:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 760393858D39 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-495-a8xKboXSNNuzRAuYFKNfMA-1; Tue, 19 Oct 2021 11:34:03 -0400 X-MC-Unique: a8xKboXSNNuzRAuYFKNfMA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C99318125C5; Tue, 19 Oct 2021 15:34:02 +0000 (UTC) Received: from localhost (unknown [10.33.36.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F1F919C79; Tue, 19 Oct 2021 15:34:01 +0000 (UTC) Date: Tue, 19 Oct 2021 16:34:00 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Jakub Jelinek Subject: [committed] libstdc++: Fix doxygen generation to work with relative paths Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="CQ9OXNrhb5HCNYdo" Content-Disposition: inline X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2021 15:34:09 -0000 --CQ9OXNrhb5HCNYdo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In r12-826 I tried to remove some redundant steps from the doxygen build, but they are needed when configure is run as a relative path. The use of pwd is to resolve the relative path to an absolute one. libstdc++-v3/ChangeLog: * doc/Makefile.am (stamp-html-doxygen, stamp-html-doxygen) (stamp-latex-doxygen, stamp-man-doxygen): Fix recipes for relative ${top_srcdir}. * doc/Makefile.in: Regenerate. Tested x86_64-linux. Committed to trunk. I'll backport to gcc-11 after testing finishes. --CQ9OXNrhb5HCNYdo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 04d392e8430ca66a3f12b7db4f3cb84788269a48 Author: Jonathan Wakely Date: Tue Oct 19 16:00:13 2021 libstdc++: Fix doxygen generation to work with relative paths In r12-826 I tried to remove some redundant steps from the doxygen build, but they are needed when configure is run as a relative path. The use of pwd is to resolve the relative path to an absolute one. libstdc++-v3/ChangeLog: * doc/Makefile.am (stamp-html-doxygen, stamp-html-doxygen) (stamp-latex-doxygen, stamp-man-doxygen): Fix recipes for relative ${top_srcdir}. * doc/Makefile.in: Regenerate. diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 487e8621b23..0aacf3f27de 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -226,10 +226,11 @@ ${doxygen_outdir}/man: mkdir -p ${doxygen_outdir}/man stamp-xml-doxygen: ${doxygen_outdir}/xml - @builddir=`cd ..; ${PWD_COMMAND}`; \ + -srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ + builddir=`cd ..; ${PWD_COMMAND}`; \ ${SHELL} ${doxygen_script} \ --host_alias=${host_alias} --mode=xml \ - "${top_srcdir}" "$${builddir}" NO || true + "$${srcdir}" "$${builddir}" NO $(STAMP) stamp-xml-doxygen stamp-xml-single-doxygen: stamp-xml-doxygen @@ -239,17 +240,19 @@ stamp-xml-single-doxygen: stamp-xml-doxygen $(STAMP) stamp-xml-single-doxygen stamp-html-doxygen: ${doxygen_outdir}/html - @builddir=`cd ..; ${PWD_COMMAND}`; \ + -srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ + builddir=`cd ..; ${PWD_COMMAND}`; \ ${SHELL} ${doxygen_script} \ --host_alias=${host_alias} --mode=html \ - "${top_srcdir}" "$${builddir}" YES || true + "$${srcdir}" "$${builddir}" YES $(STAMP) stamp-html-doxygen stamp-latex-doxygen: ${doxygen_outdir}/latex - @builddir=`cd ..; ${PWD_COMMAND}`; \ + -srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ + builddir=`cd ..; ${PWD_COMMAND}`; \ ${SHELL} ${doxygen_script} \ --host_alias=${host_alias} --mode=latex --latex_cmd=$(LATEX_CMD) \ - "${top_srcdir}" "$${builddir}" NO || true + "$${srcdir}" "$${builddir}" NO $(STAMP) stamp-latex-doxygen # Chance of loooooonnggg creation time on this rule. Iff this fails, @@ -274,10 +277,11 @@ stamp-pdf-doxygen: stamp-latex-doxygen ${doxygen_outdir}/pdf $(STAMP) stamp-pdf-doxygen stamp-man-doxygen: ${doxygen_outdir}/man - @builddir=`cd ..; ${PWD_COMMAND}`; \ + -srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \ + builddir=`cd ..; ${PWD_COMMAND}`; \ ${SHELL} ${doxygen_script} \ --host_alias=${host_alias} --mode=man \ - "${top_srcdir}" "$${builddir}" YES || true + "$${srcdir}" "$${builddir}" YES $(STAMP) stamp-man-doxygen doc-xml-doxygen: stamp-xml-doxygen --CQ9OXNrhb5HCNYdo--