diff options
| author | Gregory L. Lee <lee218@surface86.llnl.gov> | 2015-08-24 08:51:41 -0700 |
|---|---|---|
| committer | Gregory L. Lee <lee218@surface86.llnl.gov> | 2015-08-24 08:51:41 -0700 |
| commit | 689dbb8fb6ac9ed8e9e0c16d33d623e1f0a3a72a (patch) | |
| tree | 1a010955a66be18e079743cd2ce477c4fa156e9b | |
| parent | bd1cd83d7148a4856720cc7f29a1656a289fe92c (diff) | |
| download | spack-689dbb8fb6ac9ed8e9e0c16d33d623e1f0a3a72a.tar.gz spack-689dbb8fb6ac9ed8e9e0c16d33d623e1f0a3a72a.tar.bz2 spack-689dbb8fb6ac9ed8e9e0c16d33d623e1f0a3a72a.tar.xz spack-689dbb8fb6ac9ed8e9e0c16d33d623e1f0a3a72a.zip | |
use filter_file instead of patch
| -rw-r--r-- | var/spack/packages/py-numpy/gnu_fcompiler.patch | 11 | ||||
| -rw-r--r-- | var/spack/packages/py-numpy/package.py | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/var/spack/packages/py-numpy/gnu_fcompiler.patch b/var/spack/packages/py-numpy/gnu_fcompiler.patch deleted file mode 100644 index e4e882b9df..0000000000 --- a/var/spack/packages/py-numpy/gnu_fcompiler.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 76fdd48da7..efa109a3e9 100644 --- a/var/spack/packages/py-numpy/package.py +++ b/var/spack/packages/py-numpy/package.py @@ -8,13 +8,18 @@ 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 patch(self): + filter_file( + "possible_executables = \['(gfortran|g77|ifort|efl)", + "possible_executables = ['fc", + "numpy/distutils/fcompiler/gnu.py", + "numpy/distutils/fcompiler/intel.py") + def install(self, spec, prefix): with open('site.cfg', 'w') as f: f.write('[DEFAULT]\n') |