zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase

Browse Source 
Conflicts:
	lib/spack/spack/build_environment.py
	lib/spack/spack/cmd/install.py
	lib/spack/spack/cmd/setup.py
	lib/spack/spack/package.py
	var/spack/repos/builtin/packages/gmp/package.py
	var/spack/repos/builtin/packages/hdf5/package.py
This commit is contained in:
alalazo
2016-10-11 16:28:08 +02:00
parent 7a26c60dbd 4d939802ae
commit ab995df777
186 changed files with 5440 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/hdf5/package.py
View File

@@ -60,7 +60,7 @@ class Hdf5(AutotoolsPackage):
depends_on('mpi', when='+mpi')
depends_on('szip', when='+szip')
depends_on('zlib')
depends_on('zlib@1.1.2:')
@AutotoolsPackage.precondition('configure')
def validate(self):
@@ -123,16 +123,14 @@ def configure_args(self):
# this is not actually a problem.
extra_args.extend([
"--enable-parallel",
"CC=%s" % join_path(spec['mpi'].prefix.bin, "mpicc"),
"CC=%s" % spec['mpi'].mpicc
])
if '+cxx' in spec:
extra_args.append("CXX=%s" % join_path(spec['mpi'].prefix.bin,
"mpic++"))
extra_args.append("CXX=%s" % spec['mpi'].mpicxx)
if '+fortran' in spec:
extra_args.append("FC=%s" % join_path(spec['mpi'].prefix.bin,
"mpifort"))
extra_args.append("FC=%s" % spec['mpi'].mpifc)
if '+szip' in spec:
extra_args.append("--with-szlib=%s" % spec['szip'].prefix)
@@ -172,7 +170,7 @@ def check_install(self):
with open("check.c", 'w') as f:
f.write(source)
if '+mpi' in spec:
cc = which(join_path(spec['mpi'].prefix.bin, "mpicc"))
cc = which('%s' % spec['mpi'].mpicc)
else:
cc = which('cc')
# TODO: Automate these path and library settings