From 523e408fe1ee318d39b130af716034051a9219ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Andr=C3=A9=20Reuter?= <j.reuter@fz-juelich.de>
Date: Sat, 18 May 2024 20:46:07 +0200
Subject: [PATCH] scorep: Update to version 8.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan André Reuter <j.reuter@fz-juelich.de>
---
 .../perf-tools/scorep/SPECS/scorep.spec       | 66 +++++++++++++------
 1 file changed, 47 insertions(+), 19 deletions(-)

diff --git a/components/perf-tools/scorep/SPECS/scorep.spec b/components/perf-tools/scorep/SPECS/scorep.spec
index d2f9b6800d..3b8821ddd0 100644
--- a/components/perf-tools/scorep/SPECS/scorep.spec
+++ b/components/perf-tools/scorep/SPECS/scorep.spec
@@ -18,29 +18,40 @@
 
 Summary:   Scalable Performance Measurement Infrastructure for Parallel Codes
 Name:      %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-Version:   7.1
+Version:   8.4
 Release:   1%{?dist}
 License:   BSD
 Group:     %{PROJ_NAME}/perf-tools
 URL:       http://www.vi-hps.org/projects/score-p/
 Source0:   https://perftools.pages.jsc.fz-juelich.de/cicd/scorep/tags/scorep-%{version}/scorep-%{version}.tar.gz
 
-BuildRequires: fdupes
-BuildRequires: automake make which
+BuildRequires: automake
+BuildRequires: bison
 BuildRequires: binutils-devel
-Requires:      binutils-devel
+BuildRequires: chrpath
+BuildRequires: cubelib%{PROJ_DELIM} >= 4.8.2
+BuildRequires: cubew%{PROJ_DELIM} >= 4.8.2
+BuildRequires: fdupes
+BuildRequires: gcc-c++
+BuildRequires: gcc-gfortran
+BuildRequires: gcc-plugin-devel
 BuildRequires: libunwind-devel
-Requires:      libunwind-devel
-Requires:      lmod%{PROJ_DELIM} >= 7.6.1
-BuildRequires: zlib-devel gcc-c++
+BuildRequires: make
+BuildRequires: opari2%{PROJ_DELIM} >= 2.0
+BuildRequires: otf2%{PROJ_DELIM} >= 3.0
 %ifarch x86_64
 BuildRequires: papi%{PROJ_DELIM}
-Requires:      papi%{PROJ_DELIM}
 %endif
-BuildRequires: pdtoolkit-%{compiler_family}%{PROJ_DELIM}
-Requires:      pdtoolkit-%{compiler_family}%{PROJ_DELIM}
-BuildRequires: sionlib-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
-Requires:      sionlib-%{compiler_family}-%{mpi_family}%{PROJ_DELIM}
+BuildRequires: which
+Requires:      binutils-devel
+Requires:      cubelib%{PROJ_DELIM} >= 4.8.2
+Requires:      cubew%{PROJ_DELIM} >= 4.8.2
+Requires:      libunwind-devel
+Requires:      lmod%{PROJ_DELIM} >= 7.6.1
+Requires:      opari2%{PROJ_DELIM} >= 2.0
+Requires:      otf2%{PROJ_DELIM} >= 3.0
+Requires:      papi%{PROJ_DELIM}
+
 #!BuildIgnore: post-build-checks
 
 # Default library install path
@@ -66,11 +77,13 @@ This is the %{compiler_family}-%{mpi_family} version.
 %ifarch x86_64
 module load papi
 %endif
-module load pdtoolkit
-module load sionlib
+module load cubew
+module load cubelib
+module load opari2
+module load otf2
 
 %if "%{compiler_family}" == "intel"
-CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-nocross-compiler-suite=intel "
+CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-nocross-compiler-suite=oneapi "
 %endif
 
 %if "%{mpi_family}" == "impi"
@@ -99,7 +112,14 @@ CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-mpi=openmpi "
 
 export CFLAGS="$CFLAGS"
 export CXXFLAGS="$CFLAGS"
-./configure --prefix=%{install_path} --disable-static --enable-shared $CONFIGURE_OPTIONS CC=$CC CXX=$CXX F77=$F77
+./configure --prefix=%{install_path} \
+            --disable-static \
+            --enable-shared \
+            --enable-default=ompt \
+            $CONFIGURE_OPTIONS \
+            CC=$CC \
+            CXX=$CXX \
+            F77=$F77
 
 %if "%{compiler_family}" == "arm1"
 %{__sed} -i -e 's#wl=""#wl="-Wl,"#g' build-mpi/libtool
@@ -113,6 +133,10 @@ make -C build-score CC=$CC V=1 %{?_smp_mflags}
 
 make V=1 %{?_smp_mflags}
 
+%check
+
+make check
+
 %install
 
 export NO_BRP_CHECK_RPATH=true
@@ -123,6 +147,10 @@ export NO_BRP_CHECK_RPATH=true
 %ifarch x86_64
 module load papi
 %endif
+module load cubew
+module load cubelib
+module load opari2
+module load otf2
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -156,13 +184,13 @@ module-whatis "URL %{url}"
 
 set     version			    %{version}
 
-depends-on pdtoolkit
-depends-on sionlib
+depends-on opari2
+depends-on otf2
 
 prepend-path    PATH                %{install_path}/bin
 prepend-path    MANPATH             %{install_path}/share/man
 prepend-path    INCLUDE             %{install_path}/include
-prepend-path	LD_LIBRARY_PATH	    %{install_path}/lib
+prepend-path	  LD_LIBRARY_PATH	    %{install_path}/lib
 
 setenv          %{PNAME}_DIR        %{install_path}
 setenv          %{PNAME}_LIB        %{install_path}/lib