diff options
| author | Jordan Galby <67924449+Jordan474@users.noreply.github.com> | 2024-08-07 12:12:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-07 12:12:56 +0200 |
| commit | d2f269ed7bfb314bb76e9e88f62a14bf690b2021 (patch) | |
| tree | dd8e99440fc16aabc6745d83aa0d2cb4e4bf9e84 /lib | |
| parent | 4584d85ca6048c5b4e8236bff2cabfe1439b1450 (diff) | |
| download | spack-d2f269ed7bfb314bb76e9e88f62a14bf690b2021.tar.gz spack-d2f269ed7bfb314bb76e9e88f62a14bf690b2021.tar.bz2 spack-d2f269ed7bfb314bb76e9e88f62a14bf690b2021.tar.xz spack-d2f269ed7bfb314bb76e9e88f62a14bf690b2021.zip | |
Fix SIP build system installing files into python-venv (#45360)
For example: spack install py-pyqt5 or py-pyqt6 would install pylupdate5 pyrcc5 and
pyuic5 into in python-venv's install prefix.
Fix https://github.com/spack/spack/issues/45359
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/build_systems/sip.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/spack/spack/build_systems/sip.py b/lib/spack/spack/build_systems/sip.py index 5d93e23ac2..f1263c12a6 100644 --- a/lib/spack/spack/build_systems/sip.py +++ b/lib/spack/spack/build_systems/sip.py @@ -139,6 +139,10 @@ class SIPBuilder(BaseBuilder): args = ["--verbose", "--target-dir", inspect.getmodule(self.pkg).python_platlib] args.extend(self.configure_args()) + # https://github.com/Python-SIP/sip/commit/cb0be6cb6e9b756b8b0db3136efb014f6fb9b766 + if spec["py-sip"].satisfies("@6.1.0:"): + args.extend(["--scripts-dir", pkg.prefix.bin]) + sip_build = Executable(spec["py-sip"].prefix.bin.join("sip-build")) sip_build(*args) |