[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Fix gtk-doc build
From: |
Andy Wingo |
Subject: |
Re: [PATCH] Fix gtk-doc build |
Date: |
Fri, 26 Feb 2016 11:55:07 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
On Thu 25 Feb 2016 21:37, Mark H Weaver <address@hidden> writes:
> Andy Wingo <address@hidden> 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 <address@hidden>
>> 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