From 40d40ccc525dfa821b5e2998c9e767f08e0065bd Mon Sep 17 00:00:00 2001 From: Piotr Sacharuk <107190444+PiotrSacharuk@users.noreply.github.com> Date: Fri, 7 Feb 2025 14:20:19 +0100 Subject: [PATCH] Apply workarounds for oneAPI compiler for ascent problem with build (#48918) * Apply workarounds for oneAPI compiler for ascent problem with build * Use the way with use patch through the PR address * stylecheck - missing comma --- var/spack/repos/builtin/packages/ascent/package.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 05ab6a10512..9de2d4a9a14 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -148,6 +148,14 @@ class Ascent(CMakePackage, CudaPackage): # https://github.com/Alpine-DAV/ascent/pull/1123 patch("ascent-find-raja-pr1123.patch", when="@0.9.0") + # patch for fix typo in coord_type + # https://github.com/Alpine-DAV/ascent/pull/1408 + patch( + "https://github.com/Alpine-DAV/ascent/pull/1408.patch?full_index=1", + when="@0.9.3 %oneapi@2025:", + sha256="7de7f51e57f3d743c39ad80d8783a4eb482be1def51eb2d3f9259246c661f164", + ) + ########################################################################## # package dependencies ########################################################################### @@ -468,6 +476,9 @@ def hostconfig(self): if cflags: cfg.write(cmake_cache_entry("CMAKE_C_FLAGS", cflags)) cxxflags = cppflags + " ".join(spec.compiler_flags["cxxflags"]) + if spec.satisfies("%oneapi@2025:"): + cxxflags += "-Wno-error=missing-template-arg-list-after-template-kw " + cxxflags += "-Wno-missing-template-arg-list-after-template-kw" if cxxflags: cfg.write(cmake_cache_entry("CMAKE_CXX_FLAGS", cxxflags)) fflags = " ".join(spec.compiler_flags["fflags"])