Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py
This commit is contained in:
Todd Gamblin
2015-12-25 16:35:55 -08:00
303 changed files with 4025 additions and 809 deletions

View File

@@ -13,13 +13,6 @@ class PyNumpy(Package):
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')