mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
bb29bb20ac
* 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 <maxim.cournoyer@gmail.com> Change-Id: Ie3b9de0328a10efadb28d211c3fe03f9b7aaf87f
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
# Upstreamed <https://gcc.gnu.org/pipermail/gcc-patches/2023-August/628047.html>
|
|
|
|
From 2748b8df7a241c5fd6a7c2de6621c5cc56bb6ae1 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <2748b8df7a241c5fd6a7c2de6621c5cc56bb6ae1.1692808412.git.mirai@makinata.eu>
|
|
In-Reply-To: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>
|
|
References: <2db0606adfdb800f3fcc95f2cb6c13ff76246e5f.1692808412.git.mirai@makinata.eu>
|
|
From: Bruno Victal <mirai@makinata.eu>
|
|
Date: Mon, 21 Aug 2023 20:58:43 +0100
|
|
Subject: [PATCH 2/2] libstdc++: Update docbook xsl URI.
|
|
|
|
The URI for namespaced docbook-xsl was updated to reflect the current
|
|
DocBook upstream at <https://cdn.docbook.org/>.
|
|
|
|
libstdc++-v3/Changelog:
|
|
* acinclude.m4: Update docbook xsl URI.
|
|
* configure: Regenerate.
|
|
---
|
|
libstdc++-v3/acinclude.m4 | 2 +-
|
|
libstdc++-v3/configure | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
|
|
index b25378eaace..152811fd00d 100644
|
|
--- a/libstdc++-v3/acinclude.m4
|
|
+++ b/libstdc++-v3/acinclude.m4
|
|
@@ -604,7 +604,7 @@ dnl XSL_STYLE_DIR
|
|
dnl
|
|
AC_DEFUN([GLIBCXX_CONFIGURE_DOCBOOK], [
|
|
|
|
-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
|
|
+glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/
|
|
|
|
AC_MSG_CHECKING([for local stylesheet directory])
|
|
glibcxx_local_stylesheets=no
|
|
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
|
index c4da56c3042..d967b137ea1 100755
|
|
--- a/libstdc++-v3/configure
|
|
+++ b/libstdc++-v3/configure
|
|
@@ -73923,7 +73923,7 @@ fi
|
|
|
|
|
|
|
|
-glibcxx_docbook_url=http://docbook.sourceforge.net/release/xsl-ns/current/
|
|
+glibcxx_docbook_url=http://cdn.docbook.org/release/xsl/current/
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for local stylesheet directory" >&5
|
|
$as_echo_n "checking for local stylesheet directory... " >&6; }
|
|
--
|
|
2.40.1
|
|
|