diff options
| author | maya <maya@pkgsrc.org> | 2019-01-24 22:27:10 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-01-24 22:27:10 +0000 |
| commit | 491ada0f8b3eca1c22d5a4d573bd3668093eb9b1 (patch) | |
| tree | f730a78860c719fabd6c2446a3931ab25708797d /math | |
| parent | 0fbfbb269bedc4522c202b24bbaeeb5619d9de8f (diff) | |
| download | pkgsrc-491ada0f8b3eca1c22d5a4d573bd3668093eb9b1.tar.gz | |
py-numpy: backport upstream commit for PR pkg/53887
https://github.com/numpy/numpy/commit/5aa8b84aca5fda0438c4357d7d17ae4fcc926a46
Diffstat (limited to 'math')
| -rw-r--r-- | math/py-numpy/distinfo | 4 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-aa | 41 |
2 files changed, 41 insertions, 4 deletions
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo index 1bdff61e196..cd70c67f546 100644 --- a/math/py-numpy/distinfo +++ b/math/py-numpy/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.39 2019/01/15 21:36:57 adam Exp $ +$NetBSD: distinfo,v 1.40 2019/01/24 22:27:10 maya Exp $ SHA1 (numpy-1.16.0.zip) = 1a0f1faf9dea25c45ac691482051a3f81d094bd8 RMD160 (numpy-1.16.0.zip) = fae6dfa563045508d509d26510f3d9d9772aad45 SHA512 (numpy-1.16.0.zip) = a252748c54b349319c8b8b69aae8f58853ac698a9ad0fb04fd1150db543910f25bc88bb3ca73d3d51d0658ab9379756870bc7b24bbaf58ffb8717d80366a4c52 Size (numpy-1.16.0.zip) = 5052439 bytes -SHA1 (patch-aa) = c964fa13fb120b1b0f9d0bf5bc713507cd60b945 +SHA1 (patch-aa) = e783263f1e3743aa79edd0b983e292a8646ef22e SHA1 (patch-ab) = b421455fdbb666c8075d8bffbeb59533434d23e6 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = db8d3238c618ecd5900650a2150efb9459e94e96 diff --git a/math/py-numpy/patches/patch-aa b/math/py-numpy/patches/patch-aa index f1cc79b78b7..c8f4efde752 100644 --- a/math/py-numpy/patches/patch-aa +++ b/math/py-numpy/patches/patch-aa @@ -1,10 +1,47 @@ -$NetBSD: patch-aa,v 1.5 2016/07/24 15:25:22 kamil Exp $ +$NetBSD: patch-aa,v 1.6 2019/01/24 22:27:10 maya Exp $ Recognize g95 +Backport upstream commit (fixes hang): +https://github.com/numpy/numpy/commit/5aa8b84aca5fda0438c4357d7d17ae4fcc926a46 + --- numpy/distutils/fcompiler/__init__.py.orig 2013-04-07 05:04:05.000000000 +0000 +++ numpy/distutils/fcompiler/__init__.py -@@ -715,7 +715,7 @@ _default_compilers = ( +@@ -466,10 +466,8 @@ class FCompiler(CCompiler): + noarch = self.distutils_vars.get('noarch', noopt) + debug = self.distutils_vars.get('debug', False) + +- f77 = shlex.split(self.command_vars.compiler_f77, +- posix=(os.name == 'posix')) +- f90 = shlex.split(self.command_vars.compiler_f90, +- posix=(os.name == 'posix')) ++ f77 = self.command_vars.compiler_f77 ++ f90 = self.command_vars.compiler_f90 + + f77flags = [] + f90flags = [] +@@ -477,8 +475,10 @@ class FCompiler(CCompiler): + fixflags = [] + + if f77: ++ f77 = shlex.split(f77, posix=(os.name == 'posix')) + f77flags = self.flag_vars.f77 + if f90: ++ f90 = shlex.split(f90, posix=(os.name == 'posix')) + f90flags = self.flag_vars.f90 + freeflags = self.flag_vars.free + # XXX Assuming that free format is default for f90 compiler. +@@ -490,8 +490,8 @@ class FCompiler(CCompiler): + # environment variable has been customized by CI or a user + # should perhaps eventually be more throughly tested and more + # robustly handled +- fix = shlex.split(fix, posix=(os.name == 'posix')) + if fix: ++ fix = shlex.split(fix, posix=(os.name == 'posix')) + fixflags = self.flag_vars.fix + f90flags + + oflags, aflags, dflags = [], [], [] +@@ -756,7 +756,7 @@ _default_compilers = ( ('irix.*', ('mips', 'gnu', 'gnu95',)), ('aix.*', ('ibm', 'gnu', 'gnu95',)), # os.name mappings |