From bf1ef4bc376b9674cac2743e4091151abf8119c6 Mon Sep 17 00:00:00 2001 From: iarspider Date: Tue, 19 Apr 2022 14:26:26 +0200 Subject: valgrind: add support for shared and static libs(#30028) Co-authored-by: Harmen Stoppels --- var/spack/repos/builtin/packages/valgrind/package.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 8ffce9ee2d..4e620214f9 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -45,6 +45,8 @@ class Valgrind(AutotoolsPackage, SourcewarePackage): description='Sets --enable-only64bit option for valgrind') variant('ubsan', default=False, description='Activates ubsan support for valgrind') + variant('libs', default='shared,static', values=('shared', 'static'), + multi=True, description='Build shared libs, static libs or both') conflicts('+ubsan', when='%apple-clang', msg=""" @@ -73,12 +75,13 @@ clang: error: unknown argument: '-static-libubsan' def configure_args(self): spec = self.spec - options = [] + options = self.enable_or_disable('libs') if spec.satisfies('+ubsan'): options.append('--enable-ubsan') if spec.satisfies('+only64bit'): options.append('--enable-only64bit') - + if spec.satisfies('~mpi'): + options.append('--without-mpicc') if sys.platform == 'darwin': options.append('--build=amd64-darwin') return options -- cgit v1.2.3-70-g09d2