From c3a25280229c50964d64fc139929c69d8ec570b3 Mon Sep 17 00:00:00 2001 From: Jonas Lippuner Date: Sat, 7 Sep 2019 22:29:53 -0500 Subject: add mpi variant to p4est package to allow turning off MPI (#12739) --- var/spack/repos/builtin/packages/p4est/package.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/p4est/package.py b/var/spack/repos/builtin/packages/p4est/package.py index ea633589c5..c09e45546c 100644 --- a/var/spack/repos/builtin/packages/p4est/package.py +++ b/var/spack/repos/builtin/packages/p4est/package.py @@ -18,6 +18,7 @@ class P4est(AutotoolsPackage): version('2.0', 'c522c5b69896aab39aa5a81399372a19a6b03fc6200d2d5d677d9a22fe31029a') version('1.1', '37ba7f4410958cfb38a2140339dbf64f') + variant('mpi', default=True, description='Enable MPI') variant('openmp', default=False, description='Enable OpenMP') # build dependencies @@ -26,7 +27,7 @@ class P4est(AutotoolsPackage): depends_on('libtool@2.4.2:', type='build') # other dependencies - depends_on('mpi') + depends_on('mpi', when='+mpi') depends_on('zlib') # from sc upstream, correct the default libraries @@ -45,7 +46,6 @@ class P4est(AutotoolsPackage): def configure_args(self): args = [ - '--enable-mpi', '--enable-shared', '--disable-vtk-binary', '--without-blas', @@ -57,6 +57,11 @@ class P4est(AutotoolsPackage): 'F77=%s' % self.spec['mpi'].mpif77 ] + if '~mpi' in self.spec: + args.append('--disable-mpi') + else: + args.append('--enable-mpi') + if '+openmp' in self.spec: try: args.append( -- cgit v1.2.3-60-g2f50