guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: gnu: ncbi-vdb: Use "i386" instead of "i686" in directory name.


From: Ricardo Wurmus
Subject: 01/02: gnu: ncbi-vdb: Use "i386" instead of "i686" in directory name.
Date: Tue, 02 Jun 2015 12:30:52 +0000

rekado pushed a commit to branch master
in repository guix.

commit 132b4c8c235e599a28604facce7ecee01b4a446e
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Jun 1 11:31:29 2015 +0200

    gnu: ncbi-vdb: Use "i386" instead of "i686" in directory name.
    
    * gnu/packages/bioinformatics.scm (ncbi-vdb)[arguments]: Copy libraries from
      "linux/gcc/i386" directory instead of "linux/gcc/i686" when building on
      i686.
---
 gnu/packages/bioinformatics.scm |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 2355cbf..f66ea26 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1451,11 +1451,16 @@ simultaneously.")
                                    (assoc-ref inputs "hdf5"))))))
         (alist-cons-after
          'install 'install-interfaces
-         (lambda* (#:key system outputs #:allow-other-keys)
-           ;; Install interface libraries
+         (lambda* (#:key outputs #:allow-other-keys)
+           ;; Install interface libraries.  On i686 the interface libraries
+           ;; are installed to "linux/gcc/i386", so we need to use the Linux
+           ;; architecture name ("i386") instead of the target system prefix
+           ;; ("i686").
            (mkdir (string-append (assoc-ref outputs "out") "/ilib"))
            (copy-recursively (string-append "build/ncbi-vdb/linux/gcc/"
-                                            (car (string-split system #\-))
+                                            ,(system->linux-architecture
+                                              (or (%current-target-system)
+                                                  (%current-system)))
                                             "/rel/ilib")
                              (string-append (assoc-ref outputs "out")
                                             "/ilib"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]