diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-05-25 12:07:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 12:07:00 +0200 |
| commit | 56e7e2a406264479bca32f3d46013fa10ca49c21 (patch) | |
| tree | 54c46c49cf207455762e58a5214816158c38d70f /var | |
| parent | 6d29f0d61f43f1246138fc40dc7ff16410ebd17c (diff) | |
| download | spack-56e7e2a406264479bca32f3d46013fa10ca49c21.tar.gz spack-56e7e2a406264479bca32f3d46013fa10ca49c21.tar.bz2 spack-56e7e2a406264479bca32f3d46013fa10ca49c21.tar.xz spack-56e7e2a406264479bca32f3d46013fa10ca49c21.zip | |
MesonPackage: make "default_library" a multi-valued variant (#23540)
Currently if one package does `depends_on('pkg default_library=shared')`
and another does `depends_on('pkg default_library=both')`, you'd get a
concretization error.
With this PR one package can do `depends_on('pkg default_library=shared')`
and another depends_on('default_library=static'), and it would concretize to
`pkg default_library=shared,static`
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libfuse/package.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/libfuse/package.py b/var/spack/repos/builtin/packages/libfuse/package.py index 8df03c5366..298c0decdf 100644 --- a/var/spack/repos/builtin/packages/libfuse/package.py +++ b/var/spack/repos/builtin/packages/libfuse/package.py @@ -68,12 +68,10 @@ class Libfuse(MesonPackage): "INIT_D_PATH={0}".format(self.prefix.etc), ] - if 'default_library=shared' in self.spec: - args.extend(['--enable-shared', '--disable-static']) - elif 'default_library=static' in self.spec: - args.extend(['--disable-shared', '--enable-static']) - else: - args.extend(['--enable-shared', '--enable-static']) + args.append('--enable-static' if 'libs=static' in self.spec + else '--disable-static') + args.append('--enable-shared' if 'libs=shared' in self.spec + else '--disable-shared') configure(*args) |