gnu: blast+: Use INVOKE and return #T unconditionally.

* gnu/packages/bioinformatics.scm (blast+)[arguments]: Use INVOKE and
return #T unconditionally.
This commit is contained in:
Ricardo Wurmus 2018-10-20 22:22:28 +02:00
parent f8b697a385
commit f45093429c
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 28 additions and 31 deletions

View File

@ -1071,15 +1071,12 @@ package provides command line tools using the Bio++ library.")
#:parallel-build? #f ; not supported #:parallel-build? #f ; not supported
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before (add-before 'configure 'set-HOME
'configure 'set-HOME
;; $HOME needs to be set at some point during the configure phase ;; $HOME needs to be set at some point during the configure phase
(lambda _ (setenv "HOME" "/tmp") #t)) (lambda _ (setenv "HOME" "/tmp") #t))
(add-after (add-after 'unpack 'enter-dir
'unpack 'enter-dir
(lambda _ (chdir "c++") #t)) (lambda _ (chdir "c++") #t))
(add-after (add-after 'enter-dir 'fix-build-system
'enter-dir 'fix-build-system
(lambda _ (lambda _
(define (which* cmd) (define (which* cmd)
(cond ((string=? cmd "date") (cond ((string=? cmd "date")
@ -1127,8 +1124,7 @@ package provides command line tools using the Bio++ library.")
(("action=/bin/") "action=") (("action=/bin/") "action=")
(("export PATH") ":")) (("export PATH") ":"))
#t)) #t))
(replace (replace 'configure
'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(lib (string-append (assoc-ref outputs "lib") "/lib")) (lib (string-append (assoc-ref outputs "lib") "/lib"))
@ -1136,7 +1132,7 @@ package provides command line tools using the Bio++ library.")
"/include/ncbi-tools++"))) "/include/ncbi-tools++")))
;; The 'configure' script doesn't recognize things like ;; The 'configure' script doesn't recognize things like
;; '--enable-fast-install'. ;; '--enable-fast-install'.
(zero? (system* "./configure.orig" (invoke "./configure.orig"
(string-append "--with-build-root=" (getcwd) "/build") (string-append "--with-build-root=" (getcwd) "/build")
(string-append "--prefix=" out) (string-append "--prefix=" out)
(string-append "--libdir=" lib) (string-append "--libdir=" lib)
@ -1151,7 +1147,8 @@ package provides command line tools using the Bio++ library.")
;; with "-static" in its name, and again ;; with "-static" in its name, and again
;; without. ;; without.
"--without-static" "--without-static"
"--with-dll")))))))) "--with-dll")
#t))))))
(outputs '("out" ; 21 MB (outputs '("out" ; 21 MB
"lib" ; 226 MB "lib" ; 226 MB
"include")) ; 33 MB "include")) ; 33 MB