Ensure the correct compiler ABI flag is used when this package does

its own builds for dependencies.  Fixes issue on SunOS 32-bit when
the native gfortran produces 64-bit by default.

Bump PKGREVISION.

3 files changed, 18 insertions, 9 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 8b7a4181856..bd24338606b 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2012/09/11 23:04:31 asau Exp $
+# $NetBSD: Makefile,v 1.24 2013/02/21 10:59:38 jperkin Exp $
 #
 
 DISTNAME=	numpy-1.6.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
 
@@ -22,7 +23,7 @@ REPLACE_PYTHON+=	numpy/distutils/system_info.py
 REPLACE_PYTHON+=	numpy/ma/bench.py
 REPLACE_PYTHON+=	numpy/distutils/conv_template.py
 
-SUBST_CLASSES+=	numpy
+SUBST_CLASSES+=		numpy
 SUBST_STAGE.numpy=	post-patch
 SUBST_FILES.numpy=	numpy/f2py/setup.py numpy/f2py/setupscons.py
 SUBST_SED.numpy=	-e 's:/usr/bin/env %s:${PYTHONBIN}:'
@@ -47,6 +48,13 @@ LDFLAGS+=		-shared
 # linking, so ensure that we pass through requisite options.
 LDFLAGS+=		${_COMPILER_ABI_FLAG.${ABI}}
 
+# This package also does its own linking of dependent packages, so we need
+# to ensure that linker is called with the correct arguments.
+SUBST_CLASSES+=		linkabi
+SUBST_STAGE.linkabi=	post-patch
+SUBST_FILES.linkabi=	numpy/distutils/fcompiler/gnu.py
+SUBST_SED.linkabi=	-e 's,@COMPILER_ABI_FLAG@,${_COMPILER_ABI_FLAG.${ABI}},'
+
 # needs devel/py-nose
 #do-test:
 #	${PYTHONBIN} -c "import numpy; numpy.test()"
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 7755677081b..2cdd141a1ae 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2012/08/15 17:16:37 drochner Exp $
+$NetBSD: distinfo,v 1.10 2013/02/21 10:59:38 jperkin Exp $
 
 SHA1 (numpy-1.6.2.tar.gz) = c36c471f44cf914abdf37137d158bf3ffa460141
 RMD160 (numpy-1.6.2.tar.gz) = 4dcaa30e30171c2bc582495043e8e885c89935a3
@@ -6,4 +6,4 @@ Size (numpy-1.6.2.tar.gz) = 2585329 bytes
 SHA1 (patch-aa) = 4118f705888a933e73a3403d91c697d19b89097d
 SHA1 (patch-ab) = 18ef5b7ad8386a4e991bde9f7112ec7b13d2a39c
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = a45933022149d7a6ccac5f50d66afc6038d6ed95
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 57a960e8374fa506528d5da4b87c568983107641
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 25453ef02b0fa46897e974761eb6137a647794bf
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 dd9347bf96e..c24e838e9c2 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,16 +1,17 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.3 2012/08/14 20:19:21 fhajny Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.4 2013/02/21 10:59:39 jperkin Exp $
 
 Do not run a shell command when it is "None".
-Linker needs -shared explictly (at least with GCC 4.7 on SunOS).
+Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
+any ABI flags as appropriate.
 
---- numpy/distutils/fcompiler/gnu.py.orig	2011-03-11 05:56:15.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2011-09-13 20:39:16.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
 @@ -70,7 +70,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"],
++        'linker_so'    : [None, "-g", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
@@ -19,7 +20,7 @@ Linker needs -shared explictly (at least with GCC 4.7 on SunOS).
          'compiler_fix' : [None, "-Wall", "-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
 -        'linker_so'    : ["<F90>", "-Wall"],
-+        'linker_so'    : ["<F90>", "-Wall", "-shared"],
++        'linker_so'    : ["<F90>", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]