Merge branch 'develop' of https://github.com/RemoteConnectionManager/spack into paraview_fix

merge upstream develop

6 files changed, 18 insertions, 26 deletions

diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py
index 97356433be..ef4a2736db 100644
--- a/var/spack/repos/builtin/packages/cgal/package.py
+++ b/var/spack/repos/builtin/packages/cgal/package.py
@@ -46,6 +46,7 @@ class Cgal(Package):
     depends_on('mpfr')
     depends_on('gmp')
     depends_on('zlib')
+    depends_on('cmake')
 
     # FIXME : Qt5 dependency missing (needs Qt5 and OpenGL)
     # FIXME : Optional third party libraries missing
diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py
index 082da5bf0b..3f925c6546 100644
--- a/var/spack/repos/builtin/packages/expat/package.py
+++ b/var/spack/repos/builtin/packages/expat/package.py
@@ -7,6 +7,7 @@ class Expat(Package):
 
     version('2.1.0', 'dd7dab7a5fea97d2a6a43f511449b7cd')
 
+    depends_on('cmake')
 
     def install(self, spec, prefix):
 
diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py
index dd02b426b9..b346fe80c2 100644
--- a/var/spack/repos/builtin/packages/gdb/package.py
+++ b/var/spack/repos/builtin/packages/gdb/package.py
@@ -6,7 +6,7 @@
 # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
 # LLNL-CODE-647188
 #
-# For details, see https://llnl.github.io/spack
+# For details, see https://software.llnl.gov/spack
 # Please also see the LICENSE file for our notice and the LGPL.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index a8f19f9071..934d994bd3 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -196,25 +196,6 @@ class Llvm(Package):
                          when='@%(version)s' % release,
                          placement=resources[name].get('placement', None))
 
-    # SVN - current develop
-    version('develop', svn='http://llvm.org/svn/llvm-project/llvm/trunk')
-    resource(name='clang', svn='http://llvm.org/svn/llvm-project/cfe/trunk',
-             destination='tools', when='@develop', placement='clang')
-    resource(name='compiler-rt', svn='http://llvm.org/svn/llvm-project/compiler-rt/trunk',
-             destination='projects', when='@develop', placement='compiler-rt')
-    resource(name='openmp', svn='http://llvm.org/svn/llvm-project/openmp/trunk',
-             destination='projects', when='@develop', placement='openmp')
-    resource(name='libcxx', svn='http://llvm.org/svn/llvm-project/libcxx/trunk',
-             destination='projects', when='@develop', placement='libcxx')
-    resource(name='libcxxabi', svn='http://llvm.org/svn/llvm-project/libcxxabi/trunk',
-             destination='projects', when='@develop', placement='libcxxabi')
-    resource(name='polly', svn='http://llvm.org/svn/llvm-project/polly/trunk',
-             destination='tools', when='@develop', placement='polly')
-    resource(name='lldb', svn='http://llvm.org/svn/llvm-project/lldb/trunk',
-             destination='tools', when='@develop', placement='lldb')
-
-
-
     def install(self, spec, prefix):
         env['CXXFLAGS'] = self.compiler.cxx11_flag
         cmake_args = [ arg for arg in std_cmake_args if 'BUILD_TYPE' not in arg ]
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py
index 9eda11df15..d1aed78e0e 100644
--- a/var/spack/repos/builtin/packages/silo/package.py
+++ b/var/spack/repos/builtin/packages/silo/package.py
@@ -1,19 +1,28 @@
 from spack import *
 
 class Silo(Package):
-    """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files."""
+    """Silo is a library for reading and writing a wide variety of scientific
+       data to binary, disk files."""
 
     homepage = "http://wci.llnl.gov/simulation/computer-codes/silo"
     url      = "https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/silo/silo-4.8/silo-4.8.tar.gz"
 
-    #version('4.9', 'a83eda4f06761a86726e918fc55e782a')
     version('4.8', 'b1cbc0e7ec435eb656dc4b53a23663c9')
 
-    depends_on("hdf5@:1.8.12")
+    variant('fortran', default=True, description='Enable Fortran support')
+
+    depends_on("hdf5")
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix,
-                  "--with-hdf5=%s" %spec['hdf5'].prefix)
+        config_args = [
+            '--enable-fortran' if '+fortran' in spec else '--disable-fortran',
+        ]
+
+        configure(
+            "--prefix=%s" % prefix,
+            "--with-hdf5=%s,%s" % (spec['hdf5'].prefix.include, spec['hdf5'].prefix.lib),
+            "--with-zlib=%s,%s" % (spec['zlib'].prefix.include, spec['zlib'].prefix.lib),
+            *config_args)
 
         make()
         make("install")
diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py
index a83c10c0c1..6cf8d79072 100644
--- a/var/spack/repos/builtin/packages/texinfo/package.py
+++ b/var/spack/repos/builtin/packages/texinfo/package.py
@@ -6,7 +6,7 @@
 # Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
 # LLNL-CODE-647188
 #
-# For details, see https://llnl.github.io/spack
+# For details, see https://software.llnl.gov/spack
 # Please also see the LICENSE file for our notice and the LGPL.
 #
 # This program is free software; you can redistribute it and/or modify