From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: Re: [PATCH] Fix gtk-doc build Date: Thu, 25 Feb 2016 15:37:07 -0500 Message-ID: <87bn74zfv0.fsf@netris.org> References: <87a8mqfaaz.fsf@pobox.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ2fD-00011L-Ge for guix-devel@gnu.org; Thu, 25 Feb 2016 15:37:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZ2fA-0001fb-2D for guix-devel@gnu.org; Thu, 25 Feb 2016 15:37:31 -0500 Received: from world.peace.net ([50.252.239.5]:46431) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ2f9-0001dM-Ux for guix-devel@gnu.org; Thu, 25 Feb 2016 15:37:28 -0500 In-Reply-To: <87a8mqfaaz.fsf@pobox.com> (Andy Wingo's message of "Wed, 24 Feb 2016 15:32:52 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andy Wingo Cc: guix-devel@gnu.org Andy Wingo 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 > 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