diff options
| author | Konrad Hinsen <konrad.hinsen@fastmail.net> | 2017-12-20 17:18:56 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2017-12-23 22:32:48 +0100 |
| commit | e144cbcf850adca4cac8a4548632add1dc738219 (patch) | |
| tree | bd6b57a99633ce04268cb6806390b7bf347aa59b /gnu | |
| parent | 916bb9470a1689803ec8255b71bf6bde680e56ed (diff) | |
| download | patches-e144cbcf850adca4cac8a4548632add1dc738219.tar patches-e144cbcf850adca4cac8a4548632add1dc738219.tar.gz | |
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".
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/python.scm | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9fd7d9f6be..5dc7b1d847 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2619,12 +2619,12 @@ between language specification and implementation aspects.") (arguments `(#:phases (modify-phases %standard-phases - (add-before 'build 'set-environment-variables - (lambda* (#:key inputs #:allow-other-keys) - (call-with-output-file "site.cfg" - (lambda (port) - (format port - "[openblas] + (add-before 'build 'configure-blas-lapack + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "site.cfg" + (lambda (port) + (format port + "[openblas] libraries = openblas library_dirs = ~a/lib include_dirs = ~a/include @@ -2635,30 +2635,33 @@ lapack_libs = lapack library_dirs = ~a/lib include_dirs = ~a/include " - (assoc-ref inputs "openblas") - (assoc-ref inputs "openblas") - (assoc-ref inputs "lapack") - (assoc-ref inputs "lapack")))) - ;; Make /gnu/store/...-bash-.../bin/sh the default shell, instead of - ;; /bin/sh. - (substitute* "numpy/distutils/exec_command.py" - (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) - (string-append match-start (assoc-ref inputs "bash") match-end))) - ;; Use "gcc" executable, not "cc". - (substitute* "numpy/distutils/system_info.py" - (("c = distutils\\.ccompiler\\.new_compiler\\(\\)") - "c = distutils.ccompiler.new_compiler(); c.set_executables(compiler='gcc',compiler_so='gcc',linker_exe='gcc',linker_so='gcc -shared')")) - #t)) - ;; Tests can only be run after the library has been installed and not - ;; within the source directory. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "/tmp" - (zero? (system* "python" "-c" - "import numpy; numpy.test(verbose=2)")))))))) + (assoc-ref inputs "openblas") + (assoc-ref inputs "openblas") + (assoc-ref inputs "lapack") + (assoc-ref inputs "lapack")))) + #t)) + (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" + (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) + (string-append match-start (assoc-ref inputs "bash") match-end))) + ;; Use "gcc" executable, not "cc". + (substitute* "numpy/distutils/system_info.py" + (("c = distutils\\.ccompiler\\.new_compiler\\(\\)") + "c = distutils.ccompiler.new_compiler(); c.set_executables(compiler='gcc',compiler_so='gcc',linker_exe='gcc',linker_so='gcc -shared')")) + #t)) + ;; Tests can only be run after the library has been installed and not + ;; within the source directory. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (zero? (system* "python" "-c" + "import numpy; numpy.test(verbose=2)")))))))) (home-page "http://www.numpy.org/") (synopsis "Fundamental package for scientific computing with Python") (description "NumPy is the fundamental package for scientific computing |