Add patch to avoid adding Intel ifort/ifx flag on Cray ftn

This commit is contained in:
Wileam Phan 2023-06-19 14:55:00 -04:00
parent 68383ce08c
commit 6e1812a41a
2 changed files with 36 additions and 0 deletions

View File

@ -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

View File

@ -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"