Patch for building [email protected], [email protected], and [email protected]:2.61 with Intel oneAPI 2025.2; add [email protected] (spack#1592)

* Bug fix for Intel oneAPI 2025.2 that allows building [email protected]

* [@spackbot] updating style on behalf of climbfuji

* Use 'for' to apply patch in repos/spack_repo/builtin/packages/yafyaml/package.py

* Patch for building [email protected] with [email protected]

* [@spackbot] updating style on behalf of climbfuji

* Patch for building mapl with [email protected]

* [@spackbot] updating style on behalf of climbfuji

* Add [email protected], and constrain workaround for [email protected] to @:2.61

---------

Co-authored-by: climbfuji <[email protected]>

Author: climbfuji

repos/spack_repo/builtin/packages/mapl/package.py

@@ -39,6 +39,7 @@ class Mapl(CMakePackage):
     version("develop", branch="develop")
     version("main", branch="main")
 
+    version("2.62.0", sha256="5973a8cac75c55fcc0f4c5256f7d485ab99d2a52ff42d4359ce8d0f3f94d9133")
     version("2.61.0", sha256="bb768fd60214d5b6fe6120e08a5ebd869f576392a3252a4715fd7c32d0dea97a")
     version("2.60.0", sha256="470f4da9cc516fdf8206dbc84ab13f53792f3af5e54cd5315ff70d44e5700788")
     version("2.59.0", sha256="a1137bf62e885256d295c66929cd77658a559f88dbed4f433544f432c5c7a059")
@@ -140,11 +141,17 @@ class Mapl(CMakePackage):
 
     # Versions later than 3.14 remove FindESMF.cmake
     # from ESMA_CMake.
+    resource(
+        name="esma_cmake",
+        git="https://github.com/GEOS-ESM/ESMA_cmake.git",
+        tag="v3.65.0",
+        when="@2.62:",
+    )
     resource(
         name="esma_cmake",
         git="https://github.com/GEOS-ESM/ESMA_cmake.git",
         tag="v3.64.0",
-        when="@2.60:",
+        when="@2.60:2.61",
     )
     resource(
         name="esma_cmake",
@@ -344,6 +351,9 @@ class Mapl(CMakePackage):
     # when using apple-clang version 15.x or newer, need to use the llvm-openmp library
     depends_on("llvm-openmp", when="%apple-clang@15:", type=("build", "run"))
 
+    # https://community.intel.com/t5/Intel-Fortran-Compiler/Regression-with-fpp-2025-2-0/td-p/1703735
+    depends_on("gcc", when="@:2.61 ^[email protected]", type="build")
+
     def cmake_args(self):
         args = [
             self.define_from_variant("BUILD_WITH_PFLOGGER", "pflogger"),
@@ -369,6 +379,11 @@ def cmake_args(self):
             if gfortran_major_ver >= 10:
                 fflags.append("-fallow-invalid-boz")
                 fflags.append("-fallow-argument-mismatch")
+
+        # https://community.intel.com/t5/Intel-Fortran-Compiler/Regression-with-fpp-2025-2-0/td-p/1703735
+        if self.spec.satisfies("@:2.61 ^[email protected]"):
+            fflags.append(f"-fpp-name={join_path(self.stage.source_path, 'cpp_wrapper.sh')}")
+
         if fflags:
             args.append(self.define("CMAKE_Fortran_FLAGS", " ".join(fflags)))
 
@@ -415,6 +430,22 @@ def patch(self):
                 "(target_link_libraries[^)]+PUBLIC )", r"\1 %s " % nc_flags, "pfio/CMakeLists.txt"
             )
 
+        # https://community.intel.com/t5/Intel-Fortran-Compiler/Regression-with-fpp-2025-2-0/td-p/1703735
+        if self.spec.satisfies("@:2.61 ^[email protected]"):
+            cpp_wrapper = """#!/usr/bin/env bash
+cpp -P -traditional-cpp -undef \"$@\"
+"""
+            with open(join_path(self.stage.source_path, "cpp_wrapper.sh"), "w") as f:
+                f.write(cpp_wrapper)
+            set_executable(join_path(self.stage.source_path, "cpp_wrapper.sh"))
+
+            filter_file(
+                "SYSTEM_DSO_EXTENSION = SYSTEM_DSO_SUFFIX",
+                "SYSTEM_DSO_EXTENSION = 'SYSTEM_DSO_SUFFIX'",
+                "shared/DSO_Utilities.F90",
+                string=True,
+            )
+
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         # esma_cmake, an internal dependency of mapl, is
         # looking for the cmake argument -DBASEDIR, and

repos/spack_repo/builtin/packages/pflogger/package.py

@@ -76,6 +76,17 @@ class Pflogger(CMakePackage):
         msg="pFlogger only works with the Fujitsu compiler from version 1.13.0 onwards",
     )
 
+    # https://community.intel.com/t5/Intel-Fortran-Compiler/Regression-with-fpp-2025-2-0/td-p/1703735
+    conflicts(
+        "%[email protected]",
+        when="@:1.16.0",
+        msg="oneAPI 2025.2 only works with pflogger 1.16.1 onwards",
+    )
+
+    @when("@1.16.1 ^[email protected]")
+    def patch(self):
+        filter_file("_RC)", "rc=status); _VERIFY(status,'',rc)", "src/Config.F90", string=True)
+
     depends_on("[email protected]:3", type="build", when="@:1.16")
     depends_on("[email protected]:", type="build", when="@1.17:")
 

repos/spack_repo/builtin/packages/yafyaml/package.py

@@ -69,6 +69,16 @@ class Yafyaml(CMakePackage):
 
     conflicts("%[email protected]:", when="@:1.3.0", msg="GCC 13.3+ only works with yafyaml 1.4.0 onwards")
 
+    # https://community.intel.com/t5/Intel-Fortran-Compiler/Regression-with-fpp-2025-2-0/td-p/1703735
+    conflicts(
+        "%[email protected]", when="@:1.5.0", msg="oneAPI 2025.2 only works with yafyaml 1.5.1 onwards"
+    )
+
+    @when("@1.5.1 ^[email protected]")
+    def patch(self):
+        for pf in ["src/Nodes/BaseNode_implementation.F90", "src/Lexer.F90"]:
+            filter_file("__RC__)", "rc=status); __VERIFY__(status)", pf, string=True)
+
     variant(
         "build_type",
         default="Release",