Merge remote-tracking branch 'upstream/develop' into develop

4 files changed, 60 insertions, 39 deletions

diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
index ed4e7c35c9..513a38ee8a 100644
--- a/var/spack/repos/builtin/packages/hdf5/package.py
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -46,7 +46,6 @@ class Hdf5(Package):
 
     variant('cxx', default=True, description='Enable C++ support')
     variant('fortran', default=True, description='Enable Fortran support')
-    variant('unsupported', default=True, description='Enables unsupported configuration options')
 
     variant('mpi', default=False, description='Enable MPI support')
     variant('szip', default=False, description='Enable szip support')
@@ -74,6 +73,13 @@ class Hdf5(Package):
         self.validate(spec)
         # Handle compilation after spec validation
         extra_args = []
+
+        # Always enable this option. This does not actually enable any
+        # features: it only *allows* the user to specify certain
+        # combinations of other arguments. Enabling it just skips a
+        # sanity check in configure, so this doesn't merit a variant.
+        extra_args.append("--enable-unsupported")
+
         if '+debug' in spec:
             extra_args.append('--enable-debug=all')
         else:
@@ -84,9 +90,6 @@ class Hdf5(Package):
         else:
             extra_args.append('--enable-static-exec')
 
-        if '+unsupported' in spec:
-            extra_args.append("--enable-unsupported")
-
         if '+cxx' in spec:
             extra_args.append('--enable-cxx')
 
diff --git a/var/spack/repos/builtin/packages/mpfr/package.py b/var/spack/repos/builtin/packages/mpfr/package.py
index a1bd7529cf..7e6e7d5bb6 100644
--- a/var/spack/repos/builtin/packages/mpfr/package.py
+++ b/var/spack/repos/builtin/packages/mpfr/package.py
@@ -28,8 +28,9 @@ class Mpfr(Package):
     """The MPFR library is a C library for multiple-precision
        floating-point computations with correct rounding."""
     homepage = "http://www.mpfr.org"
-    url      = "http://www.mpfr.org/mpfr-current/mpfr-3.1.3.tar.bz2"
+    url      = "https://gforge.inria.fr/frs/download.php/latestfile/159/mpfr-3.1.2.tar.bz2"
 
+    version('3.1.4', 'b8a2f6b0e68bef46e53da2ac439e1cf4')
     version('3.1.3', '5fdfa3cfa5c86514ee4a241a1affa138')
     version('3.1.2', 'ee2c3ac63bf0c2359bf08fc3ee094c19')
 
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 5be187f348..efe172fc08 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -15,6 +15,7 @@ class Petsc(Package):
     version('3.5.3', 'd4fd2734661e89f18ac6014b5dd1ef2f')
     version('3.5.2', 'ad170802b3b058b5deb9cd1f968e7e13')
     version('3.5.1', 'a557e029711ebf425544e117ffa44d8f')
+    version('3.4.4', '7edbc68aa6d8d6a3295dd5f6c2f6979d')
 
     variant('shared', default=True, description='Enables the build of shared libraries')
     variant('mpi', default=True, description='Activates MPI support')
@@ -25,21 +26,21 @@ class Petsc(Package):
     variant('boost', default=True, description='Activates support for Boost')
     variant('hypre', default=True, description='Activates support for Hypre')
 
-    # Build dependencies
-    depends_on('python @2.6:2.9')  # requires Python for building
-
     # Virtual dependencies
     depends_on('blas')
     depends_on('lapack')
     depends_on('mpi', when='+mpi')
 
+    # Build dependencies
+    depends_on('python @2.6:2.7')
+
     # Other dependencies
     depends_on('boost', when='+boost')
     depends_on('metis', when='+metis')
 
-    depends_on('hdf5~cxx~unsupported+mpi', when='+hdf5+mpi')
+    depends_on('hdf5+mpi', when='+hdf5+mpi')
     depends_on('parmetis', when='+metis+mpi')
-    depends_on('hypre', when='+hypre+mpi')
+    depends_on('hypre',    when='+hypre+mpi')
 
     def mpi_dependent_options(self):
         if '~mpi' in self.spec:
@@ -50,7 +51,12 @@ class Petsc(Package):
                 '--with-mpi=0'
             ]
             error_message_fmt = '\t{library} support requires "+mpi" to be activated'
-            errors = [error_message_fmt.format(library=x) for x in ('hdf5', 'hypre') if ('+'+x) in self.spec]
+
+            # If mpi is disabled (~mpi), it's an error to have any of these enabled.
+            # This generates a list of any such errors.
+            errors = [error_message_fmt.format(library=x)
+                      for x in ('hdf5', 'hypre', 'parmetis')
+                      if ('+'+x) in self.spec]
             if errors:
                 errors = ['incompatible variants given'] + errors
                 raise RuntimeError('\n'.join(errors))
@@ -70,7 +76,7 @@ class Petsc(Package):
             '--with-blas-lapack-dir=%s' % spec['lapack'].prefix
         ])
         # Activates library support if needed
-        for library in ('metis', 'boost', 'hfd5', 'hypre', 'parmetis'):
+        for library in ('metis', 'boost', 'hdf5', 'hypre', 'parmetis'):
             options.append(
                 '--with-{library}={value}'.format(library=library, value=('1' if library in spec else '0'))
             )
@@ -79,8 +85,8 @@ class Petsc(Package):
                     '--with-{library}-dir={path}'.format(library=library, path=spec[library].prefix)
                 )
 
-
         configure('--prefix=%s' % prefix, *options)
+
         # PETSc has its own way of doing parallel make.
         make('MAKE_NP=%s' % make_jobs, parallel=False)
         make("install")
diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py
index 0e15052f64..6430f40e80 100644
--- a/var/spack/repos/builtin/packages/thrift/package.py
+++ b/var/spack/repos/builtin/packages/thrift/package.py
@@ -12,33 +12,44 @@ class Thrift(Package):
 
     version('0.9.2', '89f63cc4d0100912f4a1f8a9dee63678')
 
-    extends("python")
-
-    depends_on("autoconf")
-    depends_on("automake")
-    depends_on("bison")
-    depends_on("boost")
-    depends_on("flex")
-    depends_on("jdk")
-    depends_on("libtool")
-    depends_on("openssl")
-    depends_on("python")
-
-    # Compilation fails for most languages, fortunately cpp installs fine
-    # All other languages (yes, including C) are omitted until someone needs them
+    # Currently only support for c-family and python
+    variant('c', default=True, description="Build support for C-family languages")
+    variant('python', default=True, description="Build support for python")
+
+    depends_on('jdk')
+    depends_on('autoconf')
+    depends_on('automake')
+    depends_on('libtool')
+    depends_on('boost@1.53:')
+    depends_on('bison')
+    depends_on('flex')
+    depends_on('openssl')
+
+    # Variant dependencies
+    extends('python', when='+python')
+
+    depends_on('zlib', when='+c')
+    depends_on('libevent', when='+c')
+
     def install(self, spec, prefix):
-        env["PY_PREFIX"]   = prefix
-        env["JAVA_PREFIX"] = prefix
-
-        configure("--prefix=%s" % prefix,
-                  "--with-boost=%s" % spec['boost'].prefix,
-                  "--with-c=no",
-                  "--with-go=no",
-                  "--with-python=yes",
-                  "--with-lua=no",
-                  "--with-php=no",
-                  "--with-qt4=no",
-                  "--enable-tests=no")
+        env['PY_PREFIX'] = prefix
+        env['JAVA_HOME'] = spec['jdk'].prefix
+
+        # configure options
+        options = ['--prefix=%s' % prefix]
+
+        options.append('--with-boost=%s' % spec['boost'].prefix)
+        options.append('--enable-tests=no')
+
+        options.append('--with-c=%s' % ('yes' if '+c' in spec else 'no'))
+        options.append('--with-python=%s' % ('yes' if '+python' in spec else 'no'))
+        options.append('--with-java=%s' % ('yes' if '+java' in spec else 'no'))
+        options.append('--with-go=%s' % ('yes' if '+go' in spec else 'no'))
+        options.append('--with-lua=%s' % ('yes' if '+lua' in spec else 'no'))
+        options.append('--with-php=%s' % ('yes' if '+php' in spec else 'no'))
+        options.append('--with-qt4=%s' % ('yes' if '+qt4' in spec else 'no'))
+
+        configure(*options)
 
         make()
         make("install")