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
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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),
]
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)