gnu: julia: Use modify-phases syntax and add return values.

* gnu/packages/julia.scm (julia)[arguments]: Use modify-phases syntax for
  build phases and add missing return values.
master
Ricardo Wurmus 2015-06-24 15:21:46 +02:00
parent 83a0db178f
commit 6d149ec349
1 changed files with 45 additions and 41 deletions

View File

@ -63,7 +63,9 @@
#:validate-runpath? #f
#:phases
(alist-cons-after
(modify-phases %standard-phases
(delete 'configure)
(add-after
'unpack 'hardcode-soname-map
;; ./src/ccall.cpp creates a map from library names to paths using the
;; output of "/sbin/ldconfig -p". Since ldconfig is not used in Guix,
@ -88,27 +90,29 @@
("openlibm" "libopenlibm" "libopenlibm.so")
("openspecfun" "libopenspecfun" "libopenspecfun.so")
("fftw" "libfftw3" "libfftw3.so")
("fftwf" "libfftw3f" "libfftw3f.so")))))))
(alist-cons-before
'build 'replace-default-shell
(lambda _
(substitute* "base/client.jl"
(("/bin/sh") (which "sh"))))
(alist-cons-before
("fftwf" "libfftw3f" "libfftw3f.so"))))))
#t))
(add-before
'build 'patch-include-path
(lambda _
(substitute* "deps/Makefile"
(("/usr/include/double-conversion")
(string-append (assoc-ref %build-inputs "double-conversion")
"/include/double-conversion"))))
(alist-cons-before
"/include/double-conversion")))
#t))
(add-before
'build 'replace-default-shell
(lambda _
(substitute* "base/client.jl"
(("/bin/sh") (which "sh")))
#t))
(add-before
'check 'disable-broken-test
;; One test fails because it produces slightly different output.
(lambda _
(substitute* "test/repl.jl"
(("@test output") "# @test output")))
;; no configure script
(alist-delete 'configure %standard-phases)))))
(("@test output") "# @test output"))
#t)))
#:make-flags
(list
(string-append "prefix=" (assoc-ref %outputs "out"))