me
/
guix
Archived
1
0
Fork 0
Code

gnu: python-numpy: Reorganize patches. 

* gnu/packages/python.scm (python-numpy)[arguments]<phases>: Delete phase
"set-environment-variables".
Add phase "configure-blas-lapack". Move phase "check" after phase "install".
master
Konrad Hinsen 2017-12-20 17:18:56 +01:00 committed by Danny Milosavljevic
parent 916bb9470a
commit e144cbcf85
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/python.scm
View File

@ -2619,7 +2619,7 @@ between language specification and implementation aspects.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'set-environment-variables (add-before 'build 'configure-blas-lapack
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(call-with-output-file "site.cfg" (call-with-output-file "site.cfg"
(lambda (port) (lambda (port)
@ -2639,8 +2639,11 @@ include_dirs = ~a/include
(assoc-ref inputs "openblas") (assoc-ref inputs "openblas")
(assoc-ref inputs "lapack") (assoc-ref inputs "lapack")
(assoc-ref inputs "lapack")))) (assoc-ref inputs "lapack"))))
;; Make /gnu/store/...-bash-.../bin/sh the default shell, instead of #t))
;; /bin/sh. (add-before 'build 'fix-executable-paths
(lambda* (#:key inputs #:allow-other-keys)
;; Make /gnu/store/...-bash-.../bin/sh the default shell,
;; instead of /bin/sh.
(substitute* "numpy/distutils/exec_command.py" (substitute* "numpy/distutils/exec_command.py"
(("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end)
(string-append match-start (assoc-ref inputs "bash") match-end))) (string-append match-start (assoc-ref inputs "bash") match-end)))