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.
This commit is contained in:
Ricardo Wurmus 2015-06-01 11:31:29 +02:00
parent 52eca736f6
commit 132b4c8c23

View File

@ -1451,11 +1451,16 @@ simultaneously.")
(assoc-ref inputs "hdf5")))))) (assoc-ref inputs "hdf5"))))))
(alist-cons-after (alist-cons-after
'install 'install-interfaces 'install 'install-interfaces
(lambda* (#:key system outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install interface libraries ;; 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")) (mkdir (string-append (assoc-ref outputs "out") "/ilib"))
(copy-recursively (string-append "build/ncbi-vdb/linux/gcc/" (copy-recursively (string-append "build/ncbi-vdb/linux/gcc/"
(car (string-split system #\-)) ,(system->linux-architecture
(or (%current-target-system)
(%current-system)))
"/rel/ilib") "/rel/ilib")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
"/ilib")) "/ilib"))