Scalasca: Add patch to fix tests after OpenMP

Signed-off-by: Jan André Reuter <j.reuter@fz-juelich.de>
openhpc · Sep 18, 2024 · aad89fb · aad89fb
1 parent 09d32e9
commit aad89fb
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/components/perf-tools/scalasca/SOURCES/scalasca-2.6.1-nowarn-omp-pragmas.patch b/components/perf-tools/scalasca/SOURCES/scalasca-2.6.1-nowarn-omp-pragmas.patch
@@ -0,0 +1,39 @@
+This patch fixes a missing $ in configure, which causes following checks to
+fail if they produce any output to stdout or stderr.
+
+diff -Nrup scalasca-2.6.1.orig/build-config/m4/scalasca_nowarn_omp_pragmas.m4 scalasca-2.6.1/build-config/m4/scalasca_nowarn_omp_pragmas.m4
+--- scalasca-2.6.1.orig/build-config/m4/scalasca_nowarn_omp_pragmas.m4	2022-12-14 11:55:38.810618928 +0100
++++ scalasca-2.6.1/build-config/m4/scalasca_nowarn_omp_pragmas.m4	2023-09-27 09:47:31.155201804 +0200
+@@ -62,7 +62,7 @@ AS_CASE([$_scalasca_nowarn_omp_pragmas],
+ AC_SUBST([NOWARN_OMP_PRAGMAS_]_AC_LANG_PREFIX[FLAGS])
+
+ dnl Reset environment
+-ac_[]_AC_LANG_ABBREV[]_werror_flag=_scalasca_save_[]_AC_LANG_ABBREV[]_werror_flag
++ac_[]_AC_LANG_ABBREV[]_werror_flag=$_scalasca_save_[]_AC_LANG_ABBREV[]_werror_flag
+ ])
+
+
+diff -Nrup scalasca-2.6.1.orig/build-backend/configure scalasca-2.6.1/build-backend/configure
+--- scalasca-2.6.1.orig/build-backend/configure	2022-12-14 11:56:16.350709778 +0100
++++ scalasca-2.6.1/build-backend/configure	2023-09-27 09:49:35.847822426 +0200
+@@ -21128,7 +21128,7 @@ case $_scalasca_nowarn_omp_pragmas in #(
+ esac
+
+
+-ac_cxx_werror_flag=_scalasca_save_cxx_werror_flag
++ac_cxx_werror_flag=$_scalasca_save_cxx_werror_flag
+
+  if test "x${ac_cv_prog_cxx_openmp}" != "xunsupported" \
+                 && test "x${enable_openmp}" != "xno"; then
+diff -Nrup scalasca-2.6.1.orig/build-mpi/configure scalasca-2.6.1/build-mpi/configure
+--- scalasca-2.6.1.orig/build-mpi/configure	2022-12-14 11:56:33.574751469 +0100
++++ scalasca-2.6.1/build-mpi/configure	2023-09-27 09:49:06.135678364 +0200
+@@ -21878,7 +21878,7 @@ case $_scalasca_nowarn_omp_pragmas in #(
+ esac
+
+
+-ac_cxx_werror_flag=_scalasca_save_cxx_werror_flag
++ac_cxx_werror_flag=$_scalasca_save_cxx_werror_flag
+
+  if test "x${ac_cv_prog_cxx_openmp}" != "xunsupported" \
+                 && test "x${enable_openmp}" != "xno"; then
diff --git a/components/perf-tools/scalasca/SPECS/scalasca.spec b/components/perf-tools/scalasca/SPECS/scalasca.spec
@@ -20,7 +20,7 @@
 Summary:   Toolset for performance analysis of large-scale parallel applications
 Name:      %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
 Version:   2.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     %{PROJ_NAME}/perf-tools
 URL:       http://www.scalasca.org
@@ -33,6 +33,7 @@ Requires: cubew-%{compiler_family}%{PROJ_DELIM} >= 4.8
 Requires: cubelib-%{compiler_family}%{PROJ_DELIM} >= 4.4
 Requires: otf2-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} >= 3.0
 Requires: scorep-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} >= 1.2
+Patch1:   scalasca-2.6.1-nowarn-omp-pragmas.patch
 
 # Default library install path
 %define install_path %{OHPC_LIBS}/%{compiler_family}/%{mpi_family}/%{pname}/%version
@@ -56,6 +57,7 @@ This is the %{compiler_family}-%{mpi_family} version.
 %prep
 
 %setup -q -n %{pname}-%{version}
+%patch -P 1 -p1
 
 %build