From: Steve George <steve@futurile.net>
To: Bruno Victal <mirai@makinata.eu>
Cc: Raghav Gururajan <rg@raghavgururajan.name>,
67973@debbugs.gnu.org,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Liliana Marie Prikler <liliana.prikler@gmail.com>,
Greg Hogan <code@greghogan.com>
Subject: bug#67973: [PATCH core-updates 1/1] gnu: docbook2x: Fix build.
Date: Tue, 23 Apr 2024 14:26:16 +0100 [thread overview]
Message-ID: <Zie2-KD0E0VGKY4V@dragon2> (raw)
In-Reply-To: <9b0ef2546773ea8e8f8d7b843b4871deb8e52aa1.1703887805.git.mirai@makinata.eu>
Hi,
Builds fine on current core-updates, so closing.
Steve / Futurile
On 29 Dec, Bruno Victal wrote:
> The documentation step fails to build if the original configure script is
> removed.
>
> * gnu/packages/docbook.scm (docbook2x)[source]: Preserve original configure
> script.
> [arguments]<#:phases>: Add 'autoreconf phase.
> <#:modules>: Use %default-gnu-modules.
> ---
> gnu/packages/docbook.scm | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
> index 3046846619..02e60222ac 100644
> --- a/gnu/packages/docbook.scm
> +++ b/gnu/packages/docbook.scm
> @@ -912,21 +912,20 @@ (define-public docbook2x
> (modules '((guix build utils)))
> (snippet
> ;; Fix a failing test (maybe it worked with old texinfo?)
> - #~(begin
> - (substitute* "test/complete-manuals/at1.xml"
> - (("<bridgehead>")
> - "<bridgehead renderas=\"sect2\">"))
> - ;; Force a new autoreconf run.
> - (delete-file "configure")))))
> + #~(substitute* "test/complete-manuals/at1.xml"
> + (("<bridgehead>")
> + "<bridgehead renderas=\"sect2\">")))))
> (outputs '("out" "doc"))
> (build-system gnu-build-system)
> (arguments
> (list
> - #:modules '((guix build gnu-build-system)
> - (guix build utils)
> - (srfi srfi-26))
> + #:modules `((srfi srfi-26)
> + ,@%default-gnu-modules)
> #:phases
> #~(modify-phases %standard-phases
> + (add-after 'unpack 'autoreconf
> + (lambda _
> + (invoke "autoreconf" "-vif")))
> (add-after 'install 'move-doc
> (lambda _
> (let* ((old (string-append #$output "/share/doc"))
> --
> 2.41.0
>
>
>
>
next prev parent reply other threads:[~2024-04-23 13:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-22 19:01 bug#67973: docbook2x build failure Greg Hogan
2023-12-29 22:13 ` bug#67973: [PATCH core-updates 0/1] gnu: docbook2x: Fix build Bruno Victal
2023-12-29 22:13 ` bug#67973: [PATCH core-updates 1/1] " Bruno Victal
2024-04-23 13:26 ` Steve George [this message]
2024-03-06 18:47 ` bug#67973: [PATCH core-updates 0/1] " Greg Hogan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zie2-KD0E0VGKY4V@dragon2 \
--to=steve@futurile.net \
--cc=67973@debbugs.gnu.org \
--cc=code@greghogan.com \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=mirai@makinata.eu \
--cc=rg@raghavgururajan.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.