~ruther/guix-local: gnu: ncbi-vdb: Use "i386" instead of "i686" in directory name.

132b4c8c235e599a28604facce7ecee01b4a446e — Ricardo Wurmus 10 years ago 52eca73

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.

patch browse .tar.gz

1 files changed, 8 insertions(+), 3 deletions(-)

M gnu/packages/bioinformatics.scm

M gnu/packages/bioinformatics.scm => gnu/packages/bioinformatics.scm +8 -3

@@ 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"))