Merge branch 'develop' into features/argcomplete

var/spack/repos/builtin/packages/hydra/package.py

@@ -0,0 +1,21 @@
+from spack import *
+
+class Hydra(Package):
+    """Hydra is a process management system for starting parallel jobs.
+    Hydra is designed to natively work with existing launcher daemons
+    (such as ssh, rsh, fork), as well as natively integrate with resource
+    management systems (such as slurm, pbs, sge)."""
+
+    homepage = "http://www.mpich.org"
+    url      = "http://www.mpich.org/static/downloads/3.2/hydra-3.2.tar.gz"
+    list_url = "http://www.mpich.org/static/downloads/"
+    list_depth = 2
+
+    version('3.2', '4d670916695bf7e3a869cc336a881b39')
+
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")

var/spack/repos/builtin/packages/openmpi/package.py

@@ -1,7 +1,5 @@
-import os
-
 from spack import *
-
+import os
 
 class Openmpi(Package):
     """Open MPI is a project combining technologies and resources from
@@ -36,7 +34,6 @@ 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)
@@ -51,7 +48,6 @@ 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"]