zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MesonPackage: make "default_library" a multi-valued variant (#23540)

Browse Source 
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>
This commit is contained in:
Harmen Stoppels 2021-05-25 12:07:00 +02:00 committed by GitHub
parent 6d29f0d61f
commit 56e7e2a406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/build_systems/meson.py
View File

@ -55,9 +55,8 @@ class MesonPackage(PackageBase):
variant('buildtype', default='debugoptimized', variant('buildtype', default='debugoptimized',
description='Meson build type', description='Meson build type',
values=('plain', 'debug', 'debugoptimized', 'release', 'minsize')) values=('plain', 'debug', 'debugoptimized', 'release', 'minsize'))
variant('default_library', default='shared', variant('default_library', default='shared', values=('shared', 'static'),
description=' Default library type', multi=True, description='Build shared libs, static libs or both')
values=('shared', 'static', 'both'))
variant('strip', default=False, description='Strip targets on install') variant('strip', default=False, description='Strip targets on install')
depends_on('meson', type='build') depends_on('meson', type='build')
@ -102,9 +101,11 @@ def _std_args(pkg):
strip = 'true' if '+strip' in pkg.spec else 'false' strip = 'true' if '+strip' in pkg.spec else 'false'
try: if 'libs=static,shared' in pkg.spec:
default_library = pkg.spec.variants['default_library'].value default_library = 'both'
except KeyError: elif 'libs=static' in pkg.spec:
default_library = 'static'
else:
default_library = 'shared' default_library = 'shared'
args = [ args = [

10
var/spack/repos/builtin/packages/libfuse/package.py
View File

@ -68,12 +68,10 @@ def meson(self, spec, prefix):
"INIT_D_PATH={0}".format(self.prefix.etc), "INIT_D_PATH={0}".format(self.prefix.etc),
] ]
if 'default_library=shared' in self.spec: args.append('--enable-static' if 'libs=static' in self.spec
args.extend(['--enable-shared', '--disable-static']) else '--disable-static')
elif 'default_library=static' in self.spec: args.append('--enable-shared' if 'libs=shared' in self.spec
args.extend(['--disable-shared', '--enable-static']) else '--disable-shared')
else:
args.extend(['--enable-shared', '--enable-static'])
configure(*args) configure(*args)