Import of pkgsrc-2014Q1

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

@@ -1,30 +1,40 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.4 2013/02/21 10:59:39 jperkin Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.5 2014/02/28 09:43:11 adam Exp $
 
-Do not run a shell command when it is "None".
 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	2011-09-13 20:39:16.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2013-10-30 18:31:40.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -70,7 +70,7 @@ class GnuFCompiler(FCompiler):
+@@ -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", "-m64"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
-@@ -255,7 +255,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -127,7 +127,7 @@ class GnuFCompiler(FCompiler):
+                     s = 'Env. variable MACOSX_DEPLOYMENT_TARGET set to 10.3'
+                     warnings.warn(s)
+ 
+-            opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
++            opt.extend(['-undefined'])
+         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",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
 -        'linker_so'    : ["<F90>", "-Wall"],
-+        'linker_so'    : ["<F90>", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
++        'linker_so'    : ["<F90>", "-Wall", "-shared", "-m64"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -268,7 +268,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -270,7 +270,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""