summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd>2009-12-04 21:23:22 +0000
committermarkd <markd>2009-12-04 21:23:22 +0000
commit9e4f9c116ecccf6865ce4349dadbcd95a93daf11 (patch)
tree225ec09aad800b0ddfcb6dc7525444d374e4eb32
parent8a06f1aaee13d7cdeb57a3df2654e7a6f8ec99f5 (diff)
downloadpkgsrc-9e4f9c116ecccf6865ce4349dadbcd95a93daf11.tar.gz
Fix so works again with non-default values of PKGSRC_FORTRAN.
-rw-r--r--math/py-numpy/Makefile10
1 files changed, 7 insertions, 3 deletions
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