Import of pkgsrc-2015Q2

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

@@ -1,18 +1,18 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.6 2015/02/17 14:23:51 jperkin Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.7 2015/04/17 00:41:38 wen 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	2013-10-30 18:31:40.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2015-02-01 16:38:21.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
 @@ -72,7 +72,7 @@ class GnuFCompiler(FCompiler):
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
          'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
 -        'linker_so'    : [None, "-g", "-Wall"],
-+        'linker_so'    : [None, "-g", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
++        'linker_so'    : [None, "-g", "-Wall", "-shared", ""],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
@@ -25,21 +25,21 @@ Do not run a shell command when it is "None".
          else:
              opt.append("-shared")
          if sys.platform.startswith('sunos'):
-@@ -257,7 +257,7 @@ class Gnu95FCompiler(GnuFCompiler):
-         'compiler_f90' : [None, "-Wall", "-fno-second-underscore"] + _EXTRAFLAGS,
-         'compiler_fix' : [None, "-Wall", "-ffixed-form",
+@@ -261,7 +261,7 @@ class Gnu95FCompiler(GnuFCompiler):
                            "-fno-second-underscore"] + _EXTRAFLAGS,
--        'linker_so'    : ["<F90>", "-Wall"],
-+        'linker_so'    : ["<F90>", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
+         'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
+                           "-fno-second-underscore"] + _EXTRAFLAGS,
+-        'linker_so'    : ["<F90>", "-Wall", "-g"],
++        'linker_so'    : ["<F90>", "-Wall", "-g", "-shared", ""],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -270,7 +270,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -274,7 +274,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""
 -        if not sys.platform == 'darwin':
-+        if not sys.platform == 'darwin' or cmd == None:
++        if not sys.platform == 'darwin' or cmd==None:
              return []
          arch_flags = []
          # get arches the C compiler gets.