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

intel-oneapi-compilers: remove all patching (#45008)

Browse Source
This commit is contained in:
Robert Cohn 2024-07-03 01:34:25 -04:00 committed by GitHub
parent ae2f626168
commit b23e832002
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
View File

@ -250,7 +250,7 @@ class IntelOneapiCompilers(IntelOneApiPackage, CompilerPackage):
) )
# See https://github.com/spack/spack/issues/39252 # See https://github.com/spack/spack/issues/39252
depends_on("patchelf@:0.17", type="build") depends_on("patchelf@:0.17", type="build", when="@:2024.1")
# TODO: effectively gcc is a direct dependency of intel-oneapi-compilers, but we # TODO: effectively gcc is a direct dependency of intel-oneapi-compilers, but we
# cannot express that properly. For now, add conflicts for non-gcc compilers # cannot express that properly. For now, add conflicts for non-gcc compilers
@ -338,6 +338,12 @@ def inject_rpaths(self):
# issues. I am using the 2024 release as a milestone to stop # issues. I am using the 2024 release as a milestone to stop
# patching everything and just patching the binaries that have # patching everything and just patching the binaries that have
# a problem. # a problem.
# 2024.2 no longer needs patching
if self.spec.satisfies("@2024.2:"):
return
# 2024 fixed all but these 2
patchelf = which("patchelf") patchelf = which("patchelf")
if self.spec.satisfies("@2024:"): if self.spec.satisfies("@2024:"):
patchelf.add_default_arg("--set-rpath", self.component_prefix.lib) patchelf.add_default_arg("--set-rpath", self.component_prefix.lib)