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

SIPPackage: fix build system (#28447)

Browse Source
This commit is contained in:
Adam J. Stewart 2022-01-19 05:35:46 -06:00 committed by GitHub
parent cb95a30be7
commit 22426f17d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/build_systems/sip.py
View File

@ -102,17 +102,13 @@ def configure(self, spec, prefix):
args = self.configure_args() args = self.configure_args()
python_include_dir = os.path.basename(
inspect.getmodule(self).python_include_dir
)
args.extend([ args.extend([
'--verbose', '--verbose',
'--confirm-license', '--confirm-license',
'--qmake', spec['qt'].prefix.bin.qmake, '--qmake', spec['qt'].prefix.bin.qmake,
'--sip', spec['py-sip'].prefix.bin.sip, '--sip', spec['py-sip'].prefix.bin.sip,
'--sip-incdir', join_path(spec['py-sip'].prefix.include, '--sip-incdir', join_path(spec['py-sip'].prefix,
python_include_dir), spec['python'].package.include),
'--bindir', prefix.bin, '--bindir', prefix.bin,
'--destdir', inspect.getmodule(self).python_platlib, '--destdir', inspect.getmodule(self).python_platlib,
]) ])

3
var/spack/repos/builtin/packages/py-sip/package.py
View File

@ -53,7 +53,8 @@ def configure(self, spec, prefix):
'--sip-module={0}'.format(spec.variants['module'].value), '--sip-module={0}'.format(spec.variants['module'].value),
'--bindir={0}'.format(prefix.bin), '--bindir={0}'.format(prefix.bin),
'--destdir={0}'.format(python_platlib), '--destdir={0}'.format(python_platlib),
'--incdir={0}'.format(spec['python'].package.include), '--incdir={0}'.format(join_path(
prefix, spec['python'].package.include)),
'--sipdir={0}'.format(prefix.share.sip), '--sipdir={0}'.format(prefix.share.sip),
'--stubsdir={0}'.format(python_platlib), '--stubsdir={0}'.format(python_platlib),
] ]