pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/py-numpy Fix so works again with non-default valu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b3f6acbfa92
branches:  trunk
changeset: 568109:3b3f6acbfa92
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri Dec 04 21:23:22 2009 +0000

description:
Fix so works again with non-default values of PKGSRC_FORTRAN.

diffstat:

 math/py-numpy/Makefile |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r ccd8d8c50bf6 -r 3b3f6acbfa92 math/py-numpy/Makefile
--- a/math/py-numpy/Makefile    Fri Dec 04 15:57:47 2009 +0000
+++ b/math/py-numpy/Makefile    Fri Dec 04 21:23:22 2009 +0000
@@ -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 @@
 # 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
 



Home | Main Index | Thread Index | Old Index