From 8bc175d6f46021f852cd7d02626749c4ea850ed7 Mon Sep 17 00:00:00 2001 From: markd Date: Fri, 4 Dec 2009 21:23:22 +0000 Subject: Fix so works again with non-default values of PKGSRC_FORTRAN. --- math/py-numpy/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'math/py-numpy') diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 8472a057ac4..1354b7d0dc0 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2009/12/03 13:06:55 asau Exp $ +# $NetBSD: Makefile,v 1.8 2009/12/04 21:23:22 markd Exp $ # DISTNAME= numpy-1.3.0 PKGNAME= ${PYPKGPREFIX}-numpy-1.3.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=numpy/} @@ -27,7 +27,11 @@ REPLACE_PYTHON+= numpy/distutils/conv_template.py # XXX Avoid picking up other compilers when installed .include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mgcc) +.if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95) +PYSETUPBUILDARGS+= --fcompiler=g95 +.elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran) +PYSETUPBUILDARGS+= --fcompiler=gnu95 +.elif !empty(PKGSRC_COMPILER:Mgcc) PYSETUPBUILDARGS+= --fcompiler=gnu .endif -- cgit v1.2.3