From 22426f17d17d2933f119398422bde572156942d5 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 19 Jan 2022 05:35:46 -0600 Subject: SIPPackage: fix build system (#28447) --- lib/spack/spack/build_systems/sip.py | 8 ++------ 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), ] -- cgit v1.2.3-70-g09d2