# Upstreamed From 2db0606adfdb800f3fcc95f2cb6c13ff76246e5f Mon Sep 17 00:00:00 2001 Message-Id: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu> From: Bruno Victal Date: Mon, 21 Aug 2023 20:58:22 +0100 Subject: [PATCH 1/2] libstdc++: Fix 'doc-install-info' rule. The info manual isn't moved to the expected location after generation which causes the install rule for it to fail. libstdc++-v3/Changelog: * doc/Makefile.in: Regenerate. * doc/Makefile.am: Fix 'doc-install-info' rule. Fix typo in commment. --- libstdc++-v3/doc/Makefile.am | 4 ++-- libstdc++-v3/doc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/doc/Makefile.am b/libstdc++-v3/doc/Makefile.am index 8371441c62e..373522d593d 100644 --- a/libstdc++-v3/doc/Makefile.am +++ b/libstdc++-v3/doc/Makefile.am @@ -598,7 +598,7 @@ stamp-pdf-docbook: doc-pdf-docbook-pre doc-xml-single-docbook doc-pdf-docbook: stamp-pdf-docbook # TEXINFO, via docbook2X -# NB: Both experimental and tempermental +# NB: Both experimental and temperamental manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info DB2TEXI_FLAGS = \ @@ -615,7 +615,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo stamp-info-docbook: stamp-texinfo-docbook @echo "Generating info files..." - $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} + $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info} $(STAMP) stamp-info-docbook doc-texinfo-docbook: stamp-texinfo-docbook diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 21ad8557f7a..c19e3e3044c 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -645,7 +645,7 @@ manual_pdf = ${docbook_outdir}/pdf/libstdc++-manual.pdf DBLATEX_FLAGS = --verbose --pdf --dump --debug --tmpdir=${docbook_outdir}/latex # TEXINFO, via docbook2X -# NB: Both experimental and tempermental +# NB: Both experimental and temperamental manual_texi = ${docbook_outdir}/texinfo/libstdc++-manual.texi manual_info = ${docbook_outdir}/texinfo/libstdc++-manual.info DB2TEXI_FLAGS = \ @@ -1096,7 +1096,7 @@ stamp-texinfo-docbook: stamp-xml-single-docbook ${docbook_outdir}/texinfo stamp-info-docbook: stamp-texinfo-docbook @echo "Generating info files..." - $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} + $(MAKEINFO) $(MAKEINFOFLAGS) ${manual_texi} -o ${manual_info} $(STAMP) stamp-info-docbook doc-texinfo-docbook: stamp-texinfo-docbook base-commit: f9ff6fa58217294d63f255dd02abfcc8a074f509 -- 2.40.1 -ocean.scm (maybe-raise-unsupported-configuration-error): Likewise. * gnu/machine/ssh.scm (machine-check-file-system-availability): Likewise. (machine-check-building-for-appropriate-system): Likewise. (deploy-managed-host): Likewise. (maybe-raise-unsupported-configuration-error): Likewise. * gnu/packages.scm (search-patch): Likewise. * gnu/services.scm (%service-with-default-value): Likewise. (files->etc-directory): Likewise. (fold-services): Likewise. * gnu/system.scm (locale-name->definition*): Likewise. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Likewise. (check-luks-device): Likewise. * guix/channels.scm (latest-channel-instance): Likewise. * guix/cve.scm (json->cve-items): Likewise. * guix/git-authenticate.scm (commit-signing-key): Likewise. (commit-authorized-keys): Likewise. (authenticate-commit): Likewise. (verify-introductory-commit): Likewise. * guix/remote.scm (remote-pipe-for-gexp): Likewise. * guix/scripts/graph.scm (assert-package): Likewise. * guix/scripts/offload.scm (private-key-from-file*): Likewise. * guix/ssh.scm (authenticate-server*): Likewise. (open-ssh-session): Likewise. (remote-inferior): Likewise. * guix/ui.scm (matching-generations): Likewise. * guix/upstream.scm (package-update): Likewise. * tests/channels.scm ("latest-channel-instances, missing introduction for 'guix'"): Catch 'formatted-message?'. ("authenticate-channel, wrong first commit signer"): Likewise. * tests/lint.scm ("patches: not found"): Adjust message string. * tests/packages.scm ("patch not found yields a run-time error"): Catch 'formatted-message?'. * guix/lint.scm (check-patch-file-names): Handle 'formatted-message?'. (check-derivation): Ditto. Ludovic Courtès 2020-07-25utils: Move '&fix-hint' to (guix diagnostics)....* guix/utils.scm (&fix-hint): Move to... * guix/diagnostics.scm (&fix-hint): ... here. * gnu.scm: Adjust imports accordingly. * gnu/system/mapped-devices.scm: Likewise. * guix/channels.scm: Likewise. * guix/profiles.scm: Likewise. * guix/scripts/system/reconfigure.scm: Likewise. * guix/ssh.scm: Likewise. Ludovic Courtès 2020-07-25utils: Move <location> and '&error-location' to (guix diagnostics)....* guix/utils.scm (<location>, source-properties->location) (location->source-properties, &error-location): Move to... * guix/diagnostics.scm: ... here. * gnu.scm: Adjust imports accordingly. * gnu/machine.scm: Likewise. * gnu/system.scm: Likewise. * gnu/tests.scm: Likewise. * guix/inferior.scm: Likewise. * tests/channels.scm: Likewise. * tests/packages.scm: Likewise. Ludovic Courtès