diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-01-19 05:35:46 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 12:35:46 +0100 |
| commit | 22426f17d17d2933f119398422bde572156942d5 (patch) | |
| tree | 2267c8f883bc77a78567f8f1706c9d1aef0ec311 | |
| parent | cb95a30be7533f658cf2cad56aef990d656d1349 (diff) | |
| download | spack-22426f17d17d2933f119398422bde572156942d5.tar.gz spack-22426f17d17d2933f119398422bde572156942d5.tar.bz2 spack-22426f17d17d2933f119398422bde572156942d5.tar.xz spack-22426f17d17d2933f119398422bde572156942d5.zip | |
SIPPackage: fix build system (#28447)
| -rw-r--r-- | lib/spack/spack/build_systems/sip.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-sip/package.py | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index 7d689ee30c..b4be6ed5f2 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -102,17 +102,13 @@ class SIPPackage(PackageBase): args = self.configure_args() - python_include_dir = os.path.basename( - inspect.getmodule(self).python_include_dir - ) - args.extend([ '--verbose', '--confirm-license', '--qmake', spec['qt'].prefix.bin.qmake, '--sip', spec['py-sip'].prefix.bin.sip, - '--sip-incdir', join_path(spec['py-sip'].prefix.include, - python_include_dir), + '--sip-incdir', join_path(spec['py-sip'].prefix, + spec['python'].package.include), '--bindir', prefix.bin, '--destdir', inspect.getmodule(self).python_platlib, ]) diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py index 7e188c87d2..f0560f429b 100644 --- a/var/spack/repos/builtin/packages/py-sip/package.py +++ b/var/spack/repos/builtin/packages/py-sip/package.py @@ -53,7 +53,8 @@ class PySip(PythonPackage): '--sip-module={0}'.format(spec.variants['module'].value), '--bindir={0}'.format(prefix.bin), '--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), '--stubsdir={0}'.format(python_platlib), ] |