summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-05-05 00:53:10 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-05-05 00:53:10 -0700
commitc7f23ca0d665a861b3dfae49d2a6a53f1cd1aded (patch)
treee9865c029078763a2bbfb811305025126e4519d4
parentd0acc9827aef4797110a747454c58d8986e71435 (diff)
parent51c6867f72e91bb061e8bd021b64fa12706c0f33 (diff)
downloadspack-c7f23ca0d665a861b3dfae49d2a6a53f1cd1aded.tar.gz
spack-c7f23ca0d665a861b3dfae49d2a6a53f1cd1aded.tar.bz2
spack-c7f23ca0d665a861b3dfae49d2a6a53f1cd1aded.tar.xz
spack-c7f23ca0d665a861b3dfae49d2a6a53f1cd1aded.zip
Merge pull request #887 from adamjstewart/features/openmpi
Re-add hwloc as a dependency of openmpi
-rw-r--r--var/spack/repos/builtin/packages/openmpi/package.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 3cb9b0be21..74f0a7bfd1 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -34,6 +34,8 @@ class Openmpi(Package):
provides('mpi@:2.2', when='@1.6.5')
provides('mpi@:3.0', when='@1.7.5:')
+ depends_on('hwloc')
+
def url_for_version(self, version):
return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (version.up_to(2), version)
@@ -48,6 +50,7 @@ class Openmpi(Package):
def install(self, spec, prefix):
config_args = ["--prefix=%s" % prefix,
+ "--with-hwloc=%s" % spec['hwloc'].prefix,
"--enable-shared",
"--enable-static"]