summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/guile/package.py6
-rw-r--r--var/spack/repos/builtin/packages/libmatheval/package.py2
-rw-r--r--var/spack/repos/builtin/packages/plumed/package.py3
3 files changed, 10 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/guile/package.py b/var/spack/repos/builtin/packages/guile/package.py
index 6c02e3f1aa..1861f7da5a 100644
--- a/var/spack/repos/builtin/packages/guile/package.py
+++ b/var/spack/repos/builtin/packages/guile/package.py
@@ -18,6 +18,7 @@ class Guile(AutotoolsPackage):
version('2.0.11', 'e532c68c6f17822561e3001136635ddd')
variant('readline', default=True, description='Use the readline library')
+ variant('threads', default=True, description='Use the thread interface')
depends_on('gmp@4.2:')
depends_on('gettext')
@@ -30,6 +31,8 @@ class Guile(AutotoolsPackage):
build_directory = 'spack-build'
+ conflicts('+threads', when='%intel')
+
def configure_args(self):
spec = self.spec
@@ -38,8 +41,9 @@ class Guile(AutotoolsPackage):
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)
+ '--with-libintl-prefix={0}'.format(spec['gettext'].prefix),
]
+ config_args += self.with_or_without('threads')
if '+readline' in spec:
config_args.append('--with-libreadline-prefix={0}'.format(
diff --git a/var/spack/repos/builtin/packages/libmatheval/package.py b/var/spack/repos/builtin/packages/libmatheval/package.py
index c52a4f7a30..da39d24515 100644
--- a/var/spack/repos/builtin/packages/libmatheval/package.py
+++ b/var/spack/repos/builtin/packages/libmatheval/package.py
@@ -22,6 +22,8 @@ class Libmatheval(AutotoolsPackage):
# Only needed for unit tests, but configure crashes without it
depends_on('guile', type='build')
+ depends_on('flex')
+
# guile 2.0 provides a deprecated interface for the unit test using guile
patch('guile-2.0.patch', when='^guile@2.0')
diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py
index 9c438f25a9..35cad3d0b7 100644
--- a/var/spack/repos/builtin/packages/plumed/package.py
+++ b/var/spack/repos/builtin/packages/plumed/package.py
@@ -50,6 +50,9 @@ class Plumed(AutotoolsPackage):
depends_on('zlib')
depends_on('blas')
depends_on('lapack')
+ # For libmatheval support through the 'function' module
+ # which is enabled by default (or when optional_modules=all)
+ depends_on('libmatheval')
depends_on('mpi', when='+mpi')
depends_on('gsl', when='+gsl')