Import of pkgsrc-2016Q3

math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py

@@ -1,22 +1,31 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.7 2015/04/17 00:41:38 wen Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.8 2016/07/24 15:25:22 kamil Exp $
 
 Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
 any ABI flags as appropriate.
 On OS X, do not use '-bundle' and 'dynamic_lookup' (to avoid Python.framework).
 Do not run a shell command when it is "None".
 
---- numpy/distutils/fcompiler/gnu.py.orig	2015-02-01 16:38:21.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2016-06-25 15:38:34.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -72,7 +72,7 @@ class GnuFCompiler(FCompiler):
+@@ -57,7 +57,7 @@ class GnuFCompiler(FCompiler):
+                     return ('gfortran', m.group(1))
+         else:
+             # Output probably from --version, try harder:
+-            m = re.search(r'GNU Fortran\s+95.*?([0-9-.]+)', version_string)
++            m = re.search(r'95.*?([0-9-.]+)', version_string)
+             if m:
+                 return ('gfortran', m.group(1))
+             m = re.search(r'GNU Fortran.*?\-?([0-9-.]+)', version_string)
+@@ -87,7 +87,7 @@ class GnuFCompiler(FCompiler):
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
-         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
+         'compiler_f90' : None,  # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
 -        'linker_so'    : [None, "-g", "-Wall"],
 +        'linker_so'    : [None, "-g", "-Wall", "-shared", ""],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
-@@ -127,7 +127,7 @@ class GnuFCompiler(FCompiler):
+@@ -134,7 +134,7 @@ class GnuFCompiler(FCompiler):
                      s = 'Env. variable MACOSX_DEPLOYMENT_TARGET set to 10.3'
                      warnings.warn(s)
  
@@ -25,7 +34,7 @@ Do not run a shell command when it is "None".
          else:
              opt.append("-shared")
          if sys.platform.startswith('sunos'):
-@@ -261,7 +261,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -263,7 +263,7 @@ class Gnu95FCompiler(GnuFCompiler):
                            "-fno-second-underscore"] + _EXTRAFLAGS,
          'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
@@ -34,7 +43,7 @@ Do not run a shell command when it is "None".
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -274,7 +274,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -276,7 +276,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""