From 51fc195d14eaa85328c1d25915c560c7db99803e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 23 Jan 2025 17:18:48 -0700 Subject: [PATCH] Fix var/spack/repos/builtin/packages/ectrans/package.py: instead of declaring a conflict with Intel LLVM compilers, apply patch from upstream (#48687) --- var/spack/repos/builtin/packages/ectrans/package.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/ectrans/package.py b/var/spack/repos/builtin/packages/ectrans/package.py index b9901ff345e..62b8004d576 100644 --- a/var/spack/repos/builtin/packages/ectrans/package.py +++ b/var/spack/repos/builtin/packages/ectrans/package.py @@ -59,7 +59,11 @@ class Ectrans(CMakePackage): depends_on("fiat+mpi", when="+mpi") # https://github.com/ecmwf-ifs/ectrans/issues/194 - conflicts("%oneapi@2025:", when="@1.3.1:1.5.1") + patch( + "https://github.com/ecmwf-ifs/ectrans/commit/98f0d505d5b0866cab68a15e86e1a495bafd93d2.patch?full_index=1", + sha256="17999486a320a5c6a1a442adcdf2c341b49d005f45d09ad0e525594d50bdc39c", + when="@1.3.1:1.5.1", + ) def cmake_args(self): args = [