From 6cb14fac896ea6a0e14c7b4692dbb7f16cb23f56 Mon Sep 17 00:00:00 2001
From: fhajny <fhajny@pkgsrc.org>
Date: Tue, 14 Aug 2012 20:19:20 +0000
Subject: Fix build on SmartOS by making sure linker always gets -shared

---
 math/py-numpy/Makefile                              |  4 ++--
 math/py-numpy/distinfo                              |  4 ++--
 .../patches/patch-numpy_distutils_fcompiler_gnu.py  | 21 ++++++++++++++++++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'math')

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index c10d541cf40..942be74b78d 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/08/09 12:42:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2012/08/14 20:19:20 fhajny Exp $
 #
 
 DISTNAME=	numpy-1.6.1
@@ -44,7 +44,7 @@ PYSETUPBUILDARGS+= --fcompiler=gnu
 # LDFLAGS should either not be set or include -shared.
 LDFLAGS+=		-shared
 
-# This package bypasses the wrappers and calls the compilers directly when
+# This package bypasses the wrappers and calls the compilers directly when
 # linking, so ensure that we pass through requisite options.
 LDFLAGS+=		${_COMPILER_ABI_FLAG.${ABI}}
 
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 49ae97bc7b8..58611863ef9 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2012/04/17 17:24:41 drochner Exp $
+$NetBSD: distinfo,v 1.8 2012/08/14 20:19:20 fhajny Exp $
 
 SHA1 (numpy-1.6.1.tar.gz) = 3f73ff9231a1c15e28e6e259ef5cc35a72b34059
 RMD160 (numpy-1.6.1.tar.gz) = e4619fd5860c85a9c00bce0d0cb8dd9bb07a56f5
@@ -6,4 +6,4 @@ Size (numpy-1.6.1.tar.gz) = 2637779 bytes
 SHA1 (patch-aa) = 4118f705888a933e73a3403d91c697d19b89097d
 SHA1 (patch-ab) = 18ef5b7ad8386a4e991bde9f7112ec7b13d2a39c
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = a45933022149d7a6ccac5f50d66afc6038d6ed95
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 9d26e975e3652c4c05f1579e4ff35c7400e9840e
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 57a960e8374fa506528d5da4b87c568983107641
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 c896c40f9c5..dd9347bf96e 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,9 +1,28 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.2 2012/04/17 17:24:41 drochner Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.3 2012/08/14 20:19:21 fhajny Exp $
 
 Do not run a shell command when it is "None".
+Linker needs -shared explictly (at least with GCC 4.7 on SunOS).
 
 --- numpy/distutils/fcompiler/gnu.py.orig	2011-03-11 05:56:15.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"],
+         'archiver'     : ["ar", "-cr"],
+         'ranlib'       : ["ranlib"],
+         'linker_exe'   : [None, "-g", "-Wall"]
+@@ -255,7 +255,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"],
+         'archiver'     : ["ar", "-cr"],
+         'ranlib'       : ["ranlib"],
+         'linker_exe'   : [None, "-Wall"]
 @@ -268,7 +268,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
-- 
cgit v1.2.3