From eddd52af2e680c06d95eb1717fa0d91bd8ddcf90 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin>
Date: Tue, 17 Feb 2015 14:23:50 +0000
Subject: Restore variable substitution lost in last update, exposed by
 cwrappers.

---
 math/py-numpy/distinfo                                       | 4 ++--
 math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'math')

diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 6fd226b0659..7a1b07ea16e 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2014/02/28 09:43:10 adam Exp $
+$NetBSD: distinfo,v 1.13 2015/02/17 14:23:50 jperkin Exp $
 
 SHA1 (numpy-1.8.0.tar.gz) = a2c02c5fb2ab8cf630982cddc6821e74f5769974
 RMD160 (numpy-1.8.0.tar.gz) = 814344fb350d213a50489b33c7c50de60f4619bc
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = c500abba63c1f2464c4db1b04c9a72f41744d5ae
 SHA1 (patch-numpy_core_setup.py) = 3bab3384a9240b75458a4e07a5625c9b405bc74d
 SHA1 (patch-numpy_distutils_ccompiler.py) = 7e14f10537abbb63dacddd818f66c66e202da95e
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = ce81705fac0463d1ec808dfc9a5848b944ec5cab
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = ab79cd60a75cc2eb50f312ce50dc39a71b99af35
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 286826bd1b2e849a040879ebdf07c9e529656c80
 SHA1 (patch-numpy_distutils_fcompiler_intel.py) = 0d1d64a6309773886a4e512a0f1fedbf1cdfb741
diff --git a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
index a46b684540d..3b41e8ee7b0 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.5 2014/02/28 09:43:11 adam Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.6 2015/02/17 14:23:51 jperkin Exp $
 
 Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
 any ABI flags as appropriate.
@@ -12,7 +12,7 @@ Do not run a shell command when it is "None".
          'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
 -        'linker_so'    : [None, "-g", "-Wall"],
-+        'linker_so'    : [None, "-g", "-Wall", "-shared", "-m64"],
++        'linker_so'    : [None, "-g", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
@@ -30,7 +30,7 @@ Do not run a shell command when it is "None".
          'compiler_fix' : [None, "-Wall", "-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
 -        'linker_so'    : ["<F90>", "-Wall"],
-+        'linker_so'    : ["<F90>", "-Wall", "-shared", "-m64"],
++        'linker_so'    : ["<F90>", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-- 
cgit v1.2.3