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

Always apply Python unixcompilers.py rpath fix, not just on cray (#39929)

Browse Source 
* 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>
This commit is contained in:
Dom Heinzeller 2023-09-26 02:38:20 -06:00 committed by GitHub
parent 13816f19fd
commit 143e6a4fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/python/package.py
View File

@ -282,8 +282,8 @@ class Python(Package):
patch("tkinter-3.10.patch", when="@3.10.0:3.10 ~tkinter") patch("tkinter-3.10.patch", when="@3.10.0:3.10 ~tkinter")
patch("tkinter-3.11.patch", when="@3.11.0:3.11 ~tkinter") patch("tkinter-3.11.patch", when="@3.11.0:3.11 ~tkinter")
# Ensure that distutils chooses correct compiler option for RPATH on cray: # Ensure that distutils chooses correct compiler option for RPATH:
patch("cray-rpath-3.1.patch", when="@3 platform=cray") patch("rpath-non-gcc.patch", when="@:3.11")
# Ensure that distutils chooses correct compiler option for RPATH on fj: # 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") patch("fj-rpath-3.1.patch", when="@:3.9.7,3.10.0 %fj")

0
var/spack/repos/builtin/packages/python/cray-rpath-3.1.patch → var/spack/repos/builtin/packages/python/rpath-non-gcc.patch
View File