Subject: bug#67973: [PATCH core-updates 1/1] gnu: docbook2x: Fix build.

From: Steve George <[email-masked]>
Date: Tue, 23 Apr 2024 14:26:16 +0100

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
> 
> 
> 
>