plumed: libmatheval support (#9586)
* plumed: add libmatheval dependency (used by the 'function' module) * guile: add variant to build with threads interface * libmatheval: add flex dependency
This commit is contained in:
parent
187dfb61a3
commit
d0c38f0473
@ -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 @@ def configure_args(self):
|
||||
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(
|
||||
|
@ -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')
|
||||
|
||||
|
@ -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')
|
||||
|
Loading…
Reference in New Issue
Block a user