diff --git a/var/spack/repos/builtin/packages/papi/intel-freeform.patch b/var/spack/repos/builtin/packages/papi/intel-freeform.patch new file mode 100644 index 00000000000..8f38b4df823 --- /dev/null +++ b/var/spack/repos/builtin/packages/papi/intel-freeform.patch @@ -0,0 +1,35 @@ +diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/components/sde/tests/Makefile +--- papi-7.0.1-orig/src/components/sde/tests/Makefile 2023-06-19 14:27:44.224943877 -0400 ++++ papi-7.0.1/src/components/sde/tests/Makefile 2023-06-19 14:46:18.462536297 -0400 +@@ -1,11 +1,13 @@ + NAME=sde + include ../../Makefile_comp_tests.target + INCLUDE += -I$(datadir)/sde_lib -I.. ++ ++intel_compilers := ifort ifx + ifeq ($(notdir $(F77)),gfortran) + FFLAGS +=-ffree-form -ffree-line-length-none + else ifeq ($(notdir $(F77)),flang) + FFLAGS +=-ffree-form +-else ++else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),) + FFLAGS +=-free + endif + FFLAGS +=-g +diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/src/components/sysdetect/tests/Makefile +--- papi-7.0.1-orig/src/components/sysdetect/tests/Makefile 2023-06-19 14:27:44.220943888 -0400 ++++ papi-7.0.1/src/components/sysdetect/tests/Makefile 2023-06-19 14:46:20.678540592 -0400 +@@ -19,11 +19,12 @@ + FTESTS = + endif + ++intel_compilers := ifort ifx + ifeq ($(notdir $(F77)),gfortran) + FFLAGS +=-ffree-form -ffree-line-length-none + else ifeq ($(notdir $(F77)),flang) + FFLAGS +=-ffree-form +-else ++else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),) + FFLAGS +=-free + endif + diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index 0975b1a1a5e..3df81fcdaa0 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -81,6 +81,7 @@ class Papi(AutotoolsPackage, ROCmPackage): ) patch("crayftn-fixes.patch", when="@6.0.0:%cce@9:") patch("intel-oneapi-compiler-fixes.patch", when="@6.0.0:%oneapi") + patch("intel-freeform.patch", when="@7.0.1:%cce") configure_directory = "src"