unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: libxml2: Fixed cross-compilation.
       [not found] <1387043002-6138-1>
@ 2013-12-14 18:05 ` John Darrington
  2013-12-14 21:13   ` Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: John Darrington @ 2013-12-14 18:05 UTC (permalink / raw)
  To: guix-devel

* 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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] gnu: libxml2: Fixed cross-compilation.
  2013-12-14 18:05 ` [PATCH] gnu: libxml2: Fixed cross-compilation John Darrington
@ 2013-12-14 21:13   ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2013-12-14 21:13 UTC (permalink / raw)
  To: John Darrington; +Cc: guix-devel

John Darrington <john@darrington.wattle.id.au> skribis:

> * gnu/packages/xml.scm (libxml2): [(eq? (%current-target-system) #f)] assign "cross-libc"
>   to the variable glibc

Pushed with minor formatting adjustments, thanks!

Ludo’.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-12-14 21:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1387043002-6138-1>
2013-12-14 18:05 ` [PATCH] gnu: libxml2: Fixed cross-compilation John Darrington
2013-12-14 21:13   ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).