diff options
| author | Dom Heinzeller <dom.heinzeller@icloud.com> | 2023-09-26 02:38:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-26 02:38:20 -0600 |
| commit | 143e6a4fbb20f39d856e77eb1f838cf5d15a4cdc (patch) | |
| tree | 48e727f630da1d31862e49d31e86630cd48e49c1 | |
| parent | 13816f19fdcbc8f20bafc037763010c5a0c0d1de (diff) | |
| download | spack-143e6a4fbb20f39d856e77eb1f838cf5d15a4cdc.tar.gz spack-143e6a4fbb20f39d856e77eb1f838cf5d15a4cdc.tar.bz2 spack-143e6a4fbb20f39d856e77eb1f838cf5d15a4cdc.tar.xz spack-143e6a4fbb20f39d856e77eb1f838cf5d15a4cdc.zip | |
Always apply Python unixcompilers.py `rpath` fix, not just on cray (#39929)
* Rename var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch as var/spack/repos/builtin/packages/python/rpath-non-gcc.patch and apply unconditionally
* Update var/spack/repos/builtin/packages/python/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
---------
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/python/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/python/rpath-non-gcc.patch (renamed from var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 28803dfe65..2a904c7386 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -282,8 +282,8 @@ class Python(Package): patch("tkinter-3.10.patch", when="@3.10.0:3.10 ~tkinter") patch("tkinter-3.11.patch", when="@3.11.0:3.11 ~tkinter") - # Ensure that distutils chooses correct compiler option for RPATH on cray: - patch("cray-rpath-3.1.patch", when="@3 platform=cray") + # Ensure that distutils chooses correct compiler option for RPATH: + patch("rpath-non-gcc.patch", when="@:3.11") # Ensure that distutils chooses correct compiler option for RPATH on fj: patch("fj-rpath-3.1.patch", when="@:3.9.7,3.10.0 %fj") diff --git a/var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch b/var/spack/repos/builtin/packages/python/rpath-non-gcc.patch index f203bbbaa5..f203bbbaa5 100644 --- a/var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch +++ b/var/spack/repos/builtin/packages/python/rpath-non-gcc.patch |