Patch pkg-config and update installs for various packages

7 files changed, 70 insertions, 15 deletions

diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py
index 0392fd43e0..4b5f2c57e2 100644
--- a/var/spack/repos/builtin/packages/guile/package.py
+++ b/var/spack/repos/builtin/packages/guile/package.py
@@ -26,9 +26,8 @@ from spack import *
 
 
 class Guile(Package):
-    """Guile is designed to help programmers create flexible applications
-    that can be extended by users or other programmers with plug-ins,
-    modules, or scripts."""
+    """Guile is the GNU Ubiquitous Intelligent Language for Extensions,
+    the official extension language for the GNU operating system."""
 
     homepage = "https://www.gnu.org/software/guile/"
     url      = "ftp://ftp.gnu.org/gnu/guile/guile-2.0.11.tar.gz"
@@ -48,7 +47,25 @@ class Guile(Package):
     depends_on('pkg-config')
 
     def install(self, spec, prefix):
-        configure('--prefix={0}'.format(prefix))
+        config_args = [
+            '--prefix={0}'.format(prefix),
+            '--with-libiconv-prefix={0}'.format(spec['libiconv'].prefix),
+            '--with-libunistring-prefix={0}'.format(
+                spec['libunistring'].prefix),
+            '--with-libltdl-prefix={0}'.format(spec['libtool'].prefix),
+            '--with-libgmp-prefix={0}'.format(spec['gmp'].prefix),
+            '--with-libintl-prefix={0}'.format(spec['gettext'].prefix)
+        ]
+
+        if '+readline' in spec:
+            config_args.append('--with-libreadline-prefix={0}'.format(
+                spec['readline'].prefix))
+        else:
+            config_args.append('--without-libreadline-prefix')
+
+        configure(*config_args)
 
         make()
+        make('check')
         make('install')
+        make('installcheck')
diff --git a/var/spack/repos/builtin/packages/libctl/package.py b/var/spack/repos/builtin/packages/libctl/package.py
index d20eff4f40..1b48d4dc29 100644
--- a/var/spack/repos/builtin/packages/libctl/package.py
+++ b/var/spack/repos/builtin/packages/libctl/package.py
@@ -39,7 +39,6 @@ class Libctl(Package):
     def install(self, spec, prefix):
         configure('--prefix={0}'.format(prefix),
                   'GUILE={0}'.format(spec['guile'].prefix))
-                  # GUILE_CONFIG=/path/to/guile-config
 
         make()
         make('check')
diff --git a/var/spack/repos/builtin/packages/libiconv/package.py b/var/spack/repos/builtin/packages/libiconv/package.py
index a1e7e966c9..f2eeb07b26 100644
--- a/var/spack/repos/builtin/packages/libiconv/package.py
+++ b/var/spack/repos/builtin/packages/libiconv/package.py
@@ -35,7 +35,9 @@ class Libiconv(Package):
     version('1.14', 'e34509b1623cec449dfeb73d7ce9c6c6')
 
     def install(self, spec, prefix):
-        configure('--prefix={0}'.format(prefix))
+        configure('--prefix={0}'.format(prefix),
+                  '--enable-extra-encodings')
 
         make()
+        make('check')
         make('install')
diff --git a/var/spack/repos/builtin/packages/meep/package.py b/var/spack/repos/builtin/packages/meep/package.py
index e47e9dbc45..b88cec5a9c 100644
--- a/var/spack/repos/builtin/packages/meep/package.py
+++ b/var/spack/repos/builtin/packages/meep/package.py
@@ -34,13 +34,13 @@ class Meep(Package):
     version('1.3',   '18a5b9e18008627a0411087e0bb60db5')
     version('1.1.1', '415e0cd312b6caa22b5dd612490e1ccf')
 
-    variant('blas',    default=True, description='Enable BLAS support')
-    variant('lapack',  default=True, description='Enable LAPACK support')
-    variant('harminv', default=True, description='Enable Harminv support')
-    variant('guile',   default=True, description='Enable Guilde support')
-    variant('libctl',  default=True, description='Enable libctl support')
-    variant('mpi',     default=True, description='Enable MPI support')
-    variant('hdf5',    default=True, description='Enable HDF5 support')
+    variant('blas',    default=True,  description='Enable BLAS support')
+    variant('lapack',  default=True,  description='Enable LAPACK support')
+    variant('harminv', default=True,  description='Enable Harminv support')
+    variant('guile',   default=False, description='Enable Guilde support')
+    variant('libctl',  default=False, description='Enable libctl support')
+    variant('mpi',     default=True,  description='Enable MPI support')
+    variant('hdf5',    default=True,  description='Enable HDF5 support')
 
     # Recommended dependencies
     depends_on('blas',        when='+blas')
@@ -50,6 +50,7 @@ class Meep(Package):
     depends_on('libctl@3.2:', when='+libctl')
     depends_on('mpi',         when='+mpi')
     depends_on('hdf5',        when='+hdf5')
+    depends_on('hdf5+mpi',    when='+hdf5+mpi')
 
     def url_for_version(self, version):
         base_url = "http://ab-initio.mit.edu/meep"
diff --git a/var/spack/repos/builtin/packages/pkg-config/g_date_strftime.patch b/var/spack/repos/builtin/packages/pkg-config/g_date_strftime.patch
new file mode 100644
index 0000000000..578cbf4d7c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/pkg-config/g_date_strftime.patch
@@ -0,0 +1,33 @@
+From 00148329967adb196138372771052a3f606a6ea3 Mon Sep 17 00:00:00 2001
+From: coypu <coypu@sdf.org>
+Date: Wed, 2 Mar 2016 19:43:10 +0200
+Subject: [PATCH 2/2] gdate: Suppress string format literal warning
+
+Newer versions of GCC emit an error here, but we know it's safe.
+https://bugzilla.gnome.org/761550
+---
+ glib/glib/gdate.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c
+index 4aece02..92c34d2 100644
+--- a/glib/glib/gdate.c
++++ b/glib/glib/gdate.c
+@@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate     *d,
+  *
+  * Returns: number of characters written to the buffer, or 0 the buffer was too small
+  */
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ gsize
+ g_date_strftime (gchar       *s,
+                  gsize        slen,
+@@ -2549,3 +2552,5 @@ g_date_strftime (gchar       *s,
+   return retval;
+ #endif
+ }
++
++#pragma GCC diagnostic pop
+--
+2.7.1
diff --git a/var/spack/repos/builtin/packages/pkg-config/package.py b/var/spack/repos/builtin/packages/pkg-config/package.py
index 9227931a0f..45e8e8b74e 100644
--- a/var/spack/repos/builtin/packages/pkg-config/package.py
+++ b/var/spack/repos/builtin/packages/pkg-config/package.py
@@ -37,6 +37,9 @@ class PkgConfig(Package):
 
     parallel = False
 
+    # The following patch is needed for gcc-6.1
+    patch('g_date_strftime.patch')
+
     def install(self, spec, prefix):
         configure("--prefix={0}".format(prefix),
                   "--enable-shared",
diff --git a/var/spack/repos/builtin/packages/py-meep/package.py b/var/spack/repos/builtin/packages/py-meep/package.py
index aefa854fc2..311d94b6bd 100644
--- a/var/spack/repos/builtin/packages/py-meep/package.py
+++ b/var/spack/repos/builtin/packages/py-meep/package.py
@@ -37,13 +37,13 @@ class PyMeep(Package):
     variant('mpi', default=True, description='Enable MPI support')
 
     extends('python')
+    depends_on('mpi', when='+mpi')  # OpenMPI 1.3.3 is recommended
     depends_on('meep@1.1.1')  # must be compiled with -fPIC
+    depends_on('meep+mpi', when='+mpi')
     depends_on('swig@1.3.39:')
     depends_on('py-numpy')
     depends_on('py-scipy')
     depends_on('py-matplotlib')
-    depends_on('mpi', when='+mpi')  # OpenMPI 1.3.3 is recommended
-    # depends_on('hdf5+mpi', when='+mpi')  # ???
 
     def install(self, spec, prefix):
         setup = 'setup-mpi.py' if '+mpi' in spec else 'setup.py'