Merge pull request #887 from adamjstewart/features/openmpi

Re-add hwloc as a dependency of openmpi

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 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
 
     def install(self, spec, prefix):
         config_args = ["--prefix=%s" % prefix,
+                       "--with-hwloc=%s" % spec['hwloc'].prefix,
                        "--enable-shared",
                        "--enable-static"]