diff options
author | Bruno Victal <[email protected]> | 2023-10-09 21:06:46 +0100 |
---|---|---|
committer | Ludovic Courtès <[email protected]> | 2024-08-31 10:42:14 +0200 |
commit | bb29bb20ac4af5ac5b28d0347398f32fe2cbad97 (patch) | |
tree | 01a6671c459721936af04e866586b5c1b0751e13 /gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch | |
parent | f99112099dc877d451703aead5e874819e072166 (diff) |
gnu: libstdc++-doc: Build libstdc++ info documentation.
* gnu/packages/patches/gcc-13.2.0-libstdc++-docbook-xsl-uri.patch: New file.
* gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch: Ditto.
* gnu/packages/patches/gcc-5.5.0-libstdc++-xmlcatalog.patch: Ditto.
* gnu/local.mk: Register them.
* gnu/packages/gcc.scm
(gcc-5)[source]: Use gcc-5.5.0-libstdc++-xmlcatalog.patch,
gcc-13.2.0-libstdc++-docbook-xsl-uri.patch and
gcc-13.2.0-libstdc++-info-install-fix.patch.
(gcc-9)[source]: Use gcc-13.2.0-libstdc++-docbook-xsl-uri.patch and
gcc-13.2.0-libstdc++-info-install-fix.patch.
(make-libstdc++-doc)[arguments]<#:phases>: Remove 'set-xsl-directory.
Adjust 'build and 'install for info documentation and to respect make-flags.
[native-inputs]: Add docbook2x.
Signed-off-by: Maxim Cournoyer <[email protected]>
Change-Id: Ie3b9de0328a10efadb28d211c3fe03f9b7aaf87f
Diffstat (limited to 'gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch')
-rw-r--r-- | gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch b/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch new file mode 100644 index 0000000000..abc4cc877f --- /dev/null +++ b/gnu/packages/patches/gcc-13.2.0-libstdc++-info-install-fix.patch @@ -0,0 +1,70 @@ +# Upstreamed <https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628047.html> + +From 2db0606adfdb800f3fcc95f2cb6c13ff76246e5f Mon Sep 17 00:00:00 2001 +Message-Id: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu> +From: Bruno Victal <[email protected]> +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 + |