From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH] gnu: libxml2: Fixed cross-compilation. Date: Sat, 14 Dec 2013 19:05:17 +0100 Message-ID: <1387044317-6686-1-git-send-email-john@darrington.wattle.id.au> References: <1387043002-6138-1> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vrtay-0001iS-JU for guix-devel@gnu.org; Sat, 14 Dec 2013 13:05:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vrtas-0005z2-7W for guix-devel@gnu.org; Sat, 14 Dec 2013 13:05:44 -0500 Received: from de.cellform.com ([88.217.224.109]:34097 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vrtar-0005yk-BP for guix-devel@gnu.org; Sat, 14 Dec 2013 13:05:38 -0500 In-Reply-To: <1387043002-6138-1> 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: guix-devel@gnu.org * gnu/packages/xml.scm (libxml2): [(eq? (%current-target-system) #f)] assign "cross-libc" to the variable glibc --- gnu/packages/xml.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e2bab7b..a679142 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -75,12 +75,15 @@ things the parser might find in the XML document (like start tags).") 'install (lambda* (#:key inputs outputs #:allow-other-keys #:rest args) (let ((install (assoc-ref %standard-phases 'install)) - (glibc (assoc-ref inputs "libc")) + (glibc (assoc-ref inputs ,(if (%current-target-system) + "cross-libc" "libc"))) (out (assoc-ref outputs "out"))) (apply install args) (chdir "python") - (substitute* "setup.py" (("/opt/include") (string-append glibc "/include"))) - (system* "python" "setup.py" "install" (string-append "--prefix=" out)))) + (substitute* "setup.py" (("/opt/include") (string-append + glibc "/include"))) + (system* "python" "setup.py" "install" (string-append + "--prefix=" out)))) %standard-phases))) (description "Libxml2 is the XML C parser and toolkit developed for the Gnome project -- 1.7.10.4