[PATCH] Fix gtk-doc build

[PATCH] Fix gtk-doc build

[Andy Wingo]

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]

On media-updates, I had a failure building gtk-doc.  Not sure what is
causing this failure; was it always failing recently?  Strange stuff.


[-- Attachment #2: 0001-gnu-gtk-doc-Fix-build.patch --]
[-- Type: text/plain, Size: 1850 bytes --]

From 8c9f2582199ad1321f564ed10937457facc9453c Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Wed, 24 Feb 2016 15:31:15 +0100
Subject: [PATCH] gnu: gtk-doc: Fix build.

* gnu/packages/gtk.scm (gtk-doc): Fix build.
---
 gnu/packages/gtk.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index a234b89..9f2e514 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1107,7 +1107,24 @@ information.")
                 "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before
+             'configure 'fix-docbook
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "configure"
+               ;; The configure check is overzealous about making sure that
+               ;; things are in place -- it uses the xmlcatalog tool to make
+               ;; sure that docbook-xsl is available, but this tool can only
+               ;; look in one catalog file, unlike the $XML_CATALOG_FILES
+               ;; variable that Guix defines.  Fool the test by using the
+               ;; docbook-xsl catalog explicitly and get on with life.
+               (("\"\\$XML_CATALOG_FILE\" \
+\"http://docbook.sourceforge.net/release/xsl/")
+                (string-append (assoc-ref %build-inputs "docbook-xsl")
+                               "/xml/xsl/docbook-xsl-1.78.1/catalog.xml \
+\"http://docbook.sourceforge.net/release/xsl/"))))))
+       #:configure-flags
        (list (string-append "--with-xml-catalog="
                             (assoc-ref %build-inputs "docbook-xml")
                             "/xml/dtd/docbook/catalog.xml"))))
-- 
2.6.3

Re: [PATCH] Fix gtk-doc build

[Ludovic Courtès]

Andy Wingo <wingo@igalia.com> skribis:

> On media-updates, I had a failure building gtk-doc.  Not sure what is
> causing this failure; was it always failing recently?  Strange stuff.
>
> From 8c9f2582199ad1321f564ed10937457facc9453c Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@igalia.com>
> Date: Wed, 24 Feb 2016 15:31:15 +0100
> Subject: [PATCH] gnu: gtk-doc: Fix build.
>
> * gnu/packages/gtk.scm (gtk-doc): Fix build.

LGTM!  Or was it already applied?

If it hasn’t been applied yet, we’d need approval from Mark; perhaps
this will have to wait.  Mark?

Ludo’.

Re: [PATCH] Fix gtk-doc build

[Mark H Weaver]

Andy Wingo <wingo@igalia.com> writes:
> On media-updates, I had a failure building gtk-doc.  Not sure what is
> causing this failure; was it always failing recently?

Yes, gtk-doc has been failing to build on all platforms for quite a
while now.  IIRC, it started failing when we applied a security update
to libxml2.

Please see below for comments.

> From 8c9f2582199ad1321f564ed10937457facc9453c Mon Sep 17 00:00:00 2001
> From: Andy Wingo <wingo@igalia.com>
> Date: Wed, 24 Feb 2016 15:31:15 +0100
> Subject: [PATCH] gnu: gtk-doc: Fix build.
>
> * gnu/packages/gtk.scm (gtk-doc): Fix build.

* gnu/packages/gtk.scm (gtk-doc)[arguments]: Add 'fix-docbook' phase.

> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index a234b89..9f2e514 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -1107,7 +1107,24 @@ information.")
>                  "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"))))
>      (build-system gnu-build-system)
>      (arguments
> -     `(#:configure-flags
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before
> +             'configure 'fix-docbook
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "configure"
> +               ;; The configure check is overzealous about making sure that
> +               ;; things are in place -- it uses the xmlcatalog tool to make
> +               ;; sure that docbook-xsl is available, but this tool can only
> +               ;; look in one catalog file, unlike the $XML_CATALOG_FILES
> +               ;; variable that Guix defines.  Fool the test by using the
> +               ;; docbook-xsl catalog explicitly and get on with life.
> +               (("\"\\$XML_CATALOG_FILE\" \
> +\"http://docbook.sourceforge.net/release/xsl/")
> +                (string-append (assoc-ref %build-inputs "docbook-xsl")
> +                               "/xml/xsl/docbook-xsl-1.78.1/catalog.xml \
> +\"http://docbook.sourceforge.net/release/xsl/"))))))

Three things:

* Please use 'inputs' instead of '%build-inputs'.
* Return #t from the phase procedure.
* Instead of hard-coding the docbook-xsl version number, how about this:

--8<---------------cut here---------------start------------->8---
                (string-append (find-files (assoc-ref inputs "docbook-xsl")
                                           "^catalog.xml$")
                               " \"http://docbook.sourceforge.net/release/xsl/")
--8<---------------cut here---------------end--------------->8---

Otherwise it looks good to me.

      Thanks!
        Mark

Re: [PATCH] Fix gtk-doc build

[Andy Wingo]

On Thu 25 Feb 2016 21:37, Mark H Weaver <mhw@netris.org> writes:

> Andy Wingo <wingo@igalia.com> writes:
>> On media-updates, I had a failure building gtk-doc.  Not sure what is
>> causing this failure; was it always failing recently?
>
> Yes, gtk-doc has been failing to build on all platforms for quite a
> while now.  IIRC, it started failing when we applied a security update
> to libxml2.
>
> Please see below for comments.
>
>> From 8c9f2582199ad1321f564ed10937457facc9453c Mon Sep 17 00:00:00 2001
>> From: Andy Wingo <wingo@igalia.com>
>> Date: Wed, 24 Feb 2016 15:31:15 +0100
>> Subject: [PATCH] gnu: gtk-doc: Fix build.
>>
>> * gnu/packages/gtk.scm (gtk-doc): Fix build.
>
> * gnu/packages/gtk.scm (gtk-doc)[arguments]: Add 'fix-docbook' phase.

I misinterpreted Ludo's message and pushed the commit as I had it.
Sorry about that.

>> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
>> index a234b89..9f2e514 100644
>> --- a/gnu/packages/gtk.scm
>> +++ b/gnu/packages/gtk.scm
>> @@ -1107,7 +1107,24 @@ information.")
>>                  "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l"))))
>>      (build-system gnu-build-system)
>>      (arguments
>> -     `(#:configure-flags
>> +     `(#:phases
>> +       (modify-phases %standard-phases
>> +         (add-before
>> +             'configure 'fix-docbook
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             (substitute* "configure"
>> +               ;; The configure check is overzealous about making sure that
>> +               ;; things are in place -- it uses the xmlcatalog tool to make
>> +               ;; sure that docbook-xsl is available, but this tool can only
>> +               ;; look in one catalog file, unlike the $XML_CATALOG_FILES
>> +               ;; variable that Guix defines.  Fool the test by using the
>> +               ;; docbook-xsl catalog explicitly and get on with life.
>> +               (("\"\\$XML_CATALOG_FILE\" \
>> +\"http://docbook.sourceforge.net/release/xsl/")
>> +                (string-append (assoc-ref %build-inputs "docbook-xsl")
>> +                               "/xml/xsl/docbook-xsl-1.78.1/catalog.xml \
>> +\"http://docbook.sourceforge.net/release/xsl/"))))))
>
> Three things:
>
> * Please use 'inputs' instead of '%build-inputs'.

OK

> * Return #t from the phase procedure.

OK.  This has come up many times which indicates to me that we should
guarantee that substitute* returns a true value.

> * Instead of hard-coding the docbook-xsl version number, how about this:
>
>                 (string-append (find-files (assoc-ref inputs "docbook-xsl")
>                                            "^catalog.xml$")
>                                " \"http://docbook.sourceforge.net/release/xsl/")

OK, will do.  Will push a fix to master.

Andy

Re: [PATCH] Fix gtk-doc build

[Andy Wingo]

On Thu 25 Feb 2016 21:37, Mark H Weaver <mhw@netris.org> writes:

> Andy Wingo <wingo@igalia.com> writes:
>> On media-updates, I had a failure building gtk-doc.  Not sure what is
>> causing this failure; was it always failing recently?
>
> Yes, gtk-doc has been failing to build on all platforms for quite a
> while now.  IIRC, it started failing when we applied a security update
> to libxml2.
>
> Please see below for comments.

Ah, I now see that you pushed the fixes, Mark.  Thanks!

Andy