diff options
| author | Robert Cohn <robert.s.cohn@intel.com> | 2024-07-03 01:34:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-03 07:34:25 +0200 |
| commit | b23e8320029411512daa6633f2e12584030f22c6 (patch) | |
| tree | 26958254f98cf33999cef1e13cbe47df7384f786 | |
| parent | ae2f6261689ee1e70b621bf29f2d0f6810b6b309 (diff) | |
| download | spack-b23e8320029411512daa6633f2e12584030f22c6.tar.gz spack-b23e8320029411512daa6633f2e12584030f22c6.tar.bz2 spack-b23e8320029411512daa6633f2e12584030f22c6.tar.xz spack-b23e8320029411512daa6633f2e12584030f22c6.zip | |
intel-oneapi-compilers: remove all patching (#45008)
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py index d85c7788de..f0fece125b 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py @@ -250,7 +250,7 @@ class IntelOneapiCompilers(IntelOneApiPackage, CompilerPackage): ) # 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 # cannot express that properly. For now, add conflicts for non-gcc compilers @@ -338,6 +338,12 @@ class IntelOneapiCompilers(IntelOneApiPackage, CompilerPackage): # issues. I am using the 2024 release as a milestone to stop # patching everything and just patching the binaries that have # a problem. + + # 2024.2 no longer needs patching + if self.spec.satisfies("@2024.2:"): + return + + # 2024 fixed all but these 2 patchelf = which("patchelf") if self.spec.satisfies("@2024:"): patchelf.add_default_arg("--set-rpath", self.component_prefix.lib) |