CVS commit: pkgsrc/math/py-numpy

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Jan 24 22:27:10 UTC 2019

Modified Files:
        pkgsrc/math/py-numpy: distinfo
        pkgsrc/math/py-numpy/patches: patch-aa

Log Message:
py-numpy: backport upstream commit for PR pkg/53887

https://github.com/numpy/numpy/commit/5aa8b84aca5fda0438c4357d7d17ae4fcc926a46


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-numpy/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.39 pkgsrc/math/py-numpy/distinfo:1.40
--- pkgsrc/math/py-numpy/distinfo:1.39  Tue Jan 15 21:36:57 2019
+++ pkgsrc/math/py-numpy/distinfo       Thu Jan 24 22:27:10 2019
@@ -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

Index: pkgsrc/math/py-numpy/patches/patch-aa
diff -u pkgsrc/math/py-numpy/patches/patch-aa:1.5 pkgsrc/math/py-numpy/patches/patch-aa:1.6
--- pkgsrc/math/py-numpy/patches/patch-aa:1.5   Sun Jul 24 15:25:22 2016
+++ pkgsrc/math/py-numpy/patches/patch-aa       Thu Jan 24 22:27:10 2019
@@ -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