Merge branch 'develop' of https://github.com/LLNL/spack into issues/trilinos_385

7 files changed, 129 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
new file mode 100644
index 0000000000..d51b4a4dd5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -0,0 +1,25 @@
+from spack import *
+
+class Caliper(Package):
+    """
+    Caliper is a generic context annotation system. It gives programmers the
+    ability to provide arbitrary program context information to (performance)
+    tools at runtime.
+    """
+
+    homepage = "https://github.com/LLNL/Caliper"
+    url      = ""
+
+    version('master', git='ssh://git@github.com:LLNL/Caliper.git')
+
+    variant('mpi', default=False, description='Enable MPI function wrappers.')
+
+    depends_on('libunwind')
+    depends_on('papi')
+    depends_on('mpi', when='+mpi')
+
+    def install(self, spec, prefix):
+      with working_dir('build', create=True):
+        cmake('..', *std_cmake_args)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/fish/package.py b/var/spack/repos/builtin/packages/fish/package.py
index 1225558705..b5a4a2d209 100644
--- a/var/spack/repos/builtin/packages/fish/package.py
+++ b/var/spack/repos/builtin/packages/fish/package.py
@@ -7,7 +7,8 @@ class Fish(Package):
 
     homepage = "http://fishshell.com/"
     url      = "http://fishshell.com/files/2.2.0/fish-2.2.0.tar.gz"
-    list_url = homepage
+    list_url = "http://fishshell.com/files/"
+    list_depth = 2
 
     version('2.2.0', 'a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a')
 
diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py
new file mode 100644
index 0000000000..3dae3c4170
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hpx5/package.py
@@ -0,0 +1,52 @@
+from spack import *
+import os
+
+class Hpx5(Package):
+    """The HPX-5 Runtime System. HPX-5 (High Performance ParalleX) is an
+    open source, portable, performance-oriented runtime developed at
+    CREST (Indiana University). HPX-5 provides a distributed
+    programming model allowing programs to run unmodified on systems
+    from a single SMP to large clusters and supercomputers with
+    thousands of nodes. HPX-5 supports a wide variety of Intel and ARM
+    platforms. It is being used by a broad range of scientific
+    applications enabling scientists to write code that performs and
+    scales better than contemporary runtimes."""
+    homepage = "http://hpx.crest.iu.edu"
+    url      = "http://hpx.crest.iu.edu/release/hpx-2.0.0.tar.gz"
+
+    version('2.0.0', '3d2ff3aab6c46481f9ec65c5b2bfe7a6')
+    version('1.3.0', '2260ecc7f850e71a4d365a43017d8cee')
+    version('1.2.0', '4972005f85566af4afe8b71afbf1480f')
+    version('1.1.0', '646afb460ecb7e0eea713a634933ce4f')
+    version('1.0.0', '8020822adf6090bd59ed7fe465f6c6cb')
+
+    variant('debug', default=False, description='Build a debug version of HPX-5')
+    variant('photon', default=False, description='Enable Photon support')
+    variant('mpi', default=False, description='Enable MPI support')
+
+    depends_on("mpi", when='+mpi')
+    depends_on("mpi", when='+photon')
+
+    def install(self, spec, prefix):
+        extra_args = []
+        if '+debug' in spec:
+            extra_args.extend([
+                '--enable-debug',
+                'CFLAGS=-g -O0'
+            ])
+        else:
+            extra_args.append('CFLAGS=-O3')
+
+        if '+mpi' in spec:
+            extra_args.append('--enable-mpi')
+
+        if '+photon' in spec:
+            extra_args.extend([
+                '--enable-mpi',
+                '--enable-photon'
+            ])
+
+        os.chdir("./hpx/")
+        configure('--prefix=%s' % prefix, *extra_args)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py
index 60b315119b..ab7205646e 100644
--- a/var/spack/repos/builtin/packages/hwloc/package.py
+++ b/var/spack/repos/builtin/packages/hwloc/package.py
@@ -17,8 +17,8 @@ class Hwloc(Package):
     list_url = "http://www.open-mpi.org/software/hwloc/"
     list_depth = 3
 
-    version('1.11.2', '486169cbe111cdea57be12638828ebbf')
-    version('1.11.1', '002742efd3a8431f98d6315365a2b543')
+    version('1.11.2', 'e4ca55c2a5c5656da4a4e37c8fc51b23')
+    version('1.11.1', 'feb4e416a1b25963ed565d8b42252fdc')
     version('1.9',    '1f9f9155682fe8946a97c08896109508')
 
     depends_on('libpciaccess')
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py
new file mode 100644
index 0000000000..5d76d8866b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/m4/package.py
@@ -0,0 +1,13 @@
+from spack import *
+
+class M4(Package):
+    """GNU M4 is an implementation of the traditional Unix macro processor."""
+    homepage = "https://www.gnu.org/software/m4/m4.html"
+    url      = "ftp://ftp.gnu.org/gnu/m4/m4-1.4.17.tar.gz"
+
+    version('1.4.17', 'a5e9954b1dae036762f7b13673a2cf76')
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py
new file mode 100644
index 0000000000..62a8f7ca0b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py
@@ -0,0 +1,20 @@
+from spack import *
+
+class ParallelNetcdf(Package):
+    """Parallel netCDF (PnetCDF) is a library providing high-performance
+    parallel I/O while still maintaining file-format compatibility with
+    Unidata's NetCDF."""
+
+    homepage = "https://trac.mcs.anl.gov/projects/parallel-netcdf"
+    url      = "http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/parallel-netcdf-1.6.1.tar.gz"
+
+    version('1.6.1', '62a094eb952f9d1e15f07d56e535052604f1ac34')
+
+    depends_on("m4")
+    depends_on("mpi")
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix,
+                  "--with-mpi=%s" % spec['mpi'].prefix)
+        make()
+        make("install")
diff --git a/var/spack/repos/builtin/packages/py-wheel/package.py b/var/spack/repos/builtin/packages/py-wheel/package.py
new file mode 100644
index 0000000000..3118e74519
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-wheel/package.py
@@ -0,0 +1,15 @@
+from spack import *
+
+class PyWheel(Package):
+    """A built-package format for Python."""
+
+    homepage = "https://pypi.python.org/pypi/wheel"
+    url      = "https://pypi.python.org/packages/source/w/wheel/wheel-0.26.0.tar.gz"
+
+    version('0.26.0', '4cfc6e7e3dc7377d0164914623922a10')
+
+    extends('python')
+    depends_on('py-setuptools')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)