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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/julia.scm
View File

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