01/01: gnu: sra-tools: Fix build on i686.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 2320e76b8263eed4e753a7ae31c8b91b826ce2dc
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Sep 28 22:28:51 2016 +0200

    gnu: sra-tools: Fix build on i686.
    
    * gnu/packages/bioinformatics.scm (sra-tools)[arguments]: Pass
    "VDB_LIBDIR" in make-flags; dynamically link libmagic.
---
 gnu/packages/bioinformatics.scm |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index ea76f8d..3cf1ffc 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4580,6 +4580,14 @@ sequence itself can be retrieved from these databases.")
     (arguments
      `(#:parallel-build? #f ; not supported
        #:tests? #f ; no "check" target
+       #:make-flags
+       (list (string-append "VDB_LIBDIR="
+                            (assoc-ref %build-inputs "ncbi-vdb")
+                            ,(if (string-prefix? "x86_64"
+                                                 (or (%current-target-system)
+                                                     (%current-system)))
+                                 "/lib64"
+                                 "/lib32")))
        #:phases
        (alist-replace
         'configure
@@ -4598,6 +4606,10 @@ sequence itself can be retrieved from these databases.")
             (("my \\$ilibdir = File::Spec->catdir\\(\\$builddir, 'ilib'\\);")
              "my $ilibdir = File::Spec->catdir($dir, 'ilib');"))
 
+          ;; Dynamic linking
+          (substitute* "tools/copycat/Makefile"
+            (("smagic-static") "lmagic"))
+
           ;; The 'configure' script doesn't recognize things like
           ;; '--enable-fast-install'.
           (zero? (system*