nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: java-picard-1.113: Use INVOKE. 

* gnu/packages/bioinformatics.scm (java-picard-1.113)[arguments]: Use INVOKE
and return #T unconditionally.
This commit is contained in:
Ricardo Wurmus 2018-11-08 09:02:34 +01:00
parent e438c96558
commit c527d36f02
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/bioinformatics.scm
View File

@ -3476,26 +3476,28 @@ VCF.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "lib/jni") (mkdir-p "lib/jni")
(mkdir-p "jdk-src") (mkdir-p "jdk-src")
(and (zero? (system* "tar" "--strip-components=1" "-C" "jdk-src" (invoke "tar" "--strip-components=1" "-C" "jdk-src"
"-xf" (assoc-ref inputs "jdk-src"))) "-xf" (assoc-ref inputs "jdk-src"))
(zero? (system* "javah" "-jni" (invoke "javah" "-jni"
"-classpath" "classes" "-classpath" "classes"
"-d" "lib/" "-d" "lib/"
"net.sf.samtools.util.zip.IntelDeflater")) "net.sf.samtools.util.zip.IntelDeflater")
(with-directory-excursion "src/c/inteldeflater" (with-directory-excursion "src/c/inteldeflater"
(zero? (system* "gcc" "-I../../../lib" "-I." (invoke "gcc" "-I../../../lib" "-I."
(string-append "-I" (assoc-ref inputs "jdk") (string-append "-I" (assoc-ref inputs "jdk")
"/include/linux") "/include/linux")
"-I../../../jdk-src/src/share/native/common/" "-I../../../jdk-src/src/share/native/common/"
"-I../../../jdk-src/src/solaris/native/common/" "-I../../../jdk-src/src/solaris/native/common/"
"-c" "-O3" "-fPIC" "IntelDeflater.c")) "-c" "-O3" "-fPIC" "IntelDeflater.c")
(zero? (system* "gcc" "-shared" (invoke "gcc" "-shared"
"-o" "../../../lib/jni/libIntelDeflater.so" "-o" "../../../lib/jni/libIntelDeflater.so"
"IntelDeflater.o" "-lz" "-lstdc++")))))) "IntelDeflater.o" "-lz" "-lstdc++"))
#t))
;; We can only build everything else after building the JNI library. ;; We can only build everything else after building the JNI library.
(add-after 'build-jni 'build-rest (add-after 'build-jni 'build-rest
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(zero? (apply system* `("ant" "all" ,@make-flags))))) (apply invoke `("ant" "all" ,@make-flags))
#t))
(add-before 'build 'set-JAVA6_HOME (add-before 'build 'set-JAVA6_HOME
(lambda _ (lambda _
(setenv "JAVA6_HOME" (getenv "JAVA_HOME")) (setenv "JAVA6_HOME" (getenv "JAVA_HOME"))