From bd1cd83d7148a4856720cc7f29a1656a289fe92c Mon Sep 17 00:00:00 2001
From: "Gregory L. Lee" <lee218@surface86.llnl.gov>
Date: Mon, 17 Aug 2015 11:54:14 -0700
Subject: added lapack and blas deps, fixed gfortran compiler dependency
---
var/spack/packages/py-numpy/gnu_fcompiler.patch | 11 +++++++++++
var/spack/packages/py-numpy/package.py | 8 ++++++++
var/spack/packages/py-scipy/package.py | 2 ++
3 files changed, 21 insertions(+)
create mode 100644 var/spack/packages/py-numpy/gnu_fcompiler.patch
diff --git a/var/spack/packages/py-numpy/gnu_fcompiler.patch b/var/spack/packages/py-numpy/gnu_fcompiler.patch
new file mode 100644
index 0000000000..e4e882b9df
--- /dev/null
+++ b/var/spack/packages/py-numpy/gnu_fcompiler.patch
@@ -0,0 +1,11 @@
+--- a/numpy/distutils/fcompiler/gnu.py.orig 2015-08-17 11:31:52.000000000 -0700
++++ b/numpy/distutils/fcompiler/gnu.py 2015-08-17 11:32:48.000000000 -0700
+@@ -252,7 +252,7 @@
+ # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
+ # GNU Fortran (GCC) 4.3.0 20070316 (experimental)
+
+- possible_executables = ['gfortran', 'f95']
++ possible_executables = ['fc', 'f95']
+ executables = {
+ 'version_cmd' : ["<F90>", "--version"],
+ 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form",
diff --git a/var/spack/packages/py-numpy/package.py b/var/spack/packages/py-numpy/package.py
index 6534e063d2..76fdd48da7 100644
--- a/var/spack/packages/py-numpy/package.py
+++ b/var/spack/packages/py-numpy/package.py
@@ -7,9 +7,17 @@ class PyNumpy(Package):
version('1.9.1', '78842b73560ec378142665e712ae4ad9')
version('1.9.2', 'a1ed53432dbcd256398898d35bc8e645')
+
+ patch('gnu_fcompiler.patch', when='%gcc')
extends('python')
depends_on('py-nose')
+ depends_on('netlib-blas+fpic')
+ depends_on('netlib-lapack+shared')
def install(self, spec, prefix):
+ with open('site.cfg', 'w') as f:
+ f.write('[DEFAULT]\n')
+ f.write('libraries=lapack,blas\n')
+ f.write('library_dirs=%s/lib:%s/lib\n' % (spec['blas'].prefix, spec['lapack'].prefix))
python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/py-scipy/package.py b/var/spack/packages/py-scipy/package.py
index cdcf74534b..3a1124cc15 100644
--- a/var/spack/packages/py-scipy/package.py
+++ b/var/spack/packages/py-scipy/package.py
@@ -11,6 +11,8 @@ class PyScipy(Package):
extends('python')
depends_on('py-nose')
depends_on('py-numpy')
+ depends_on('blas')
+ depends_on('lapack')
def install(self, spec, prefix):
python('setup.py', 'install', '--prefix=%s' % prefix)
--
cgit v1.2.3-70-g09d2