diff --git a/components/perf-tools/scorep/SOURCES/Score-P-10.0_fix-intel-mpi-linker-error.patch b/components/perf-tools/scorep/SOURCES/Score-P-10.0_fix-intel-mpi-linker-error.patch deleted file mode 100644 index 91d13f8926..0000000000 --- a/components/perf-tools/scorep/SOURCES/Score-P-10.0_fix-intel-mpi-linker-error.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/build-config/common/platforms/compiler-mpi-intel b/build-config/common/platforms/compiler-mpi-intel -index 25bd829e1..77780d102 100644 ---- a/build-config/common/platforms/compiler-mpi-intel -+++ b/build-config/common/platforms/compiler-mpi-intel -@@ -14,7 +14,6 @@ MPI_FFLAGS={FFLAGS} - MPI_FCFLAGS={FCFLAGS} - #MPI_LDFLAGS= - #MPI_LIBS= --MPILIB_LDFLAGS=-Wc,-nolinkage - - # # Scalasca1 settings - # MPILIB = -lmpi -diff --git a/build-config/common/platforms/compiler-mpi-intel2 b/build-config/common/platforms/compiler-mpi-intel2 -index 9150320b3..354342589 100644 ---- a/build-config/common/platforms/compiler-mpi-intel2 -+++ b/build-config/common/platforms/compiler-mpi-intel2 -@@ -14,7 +14,6 @@ MPI_FFLAGS={FFLAGS} - MPI_FCFLAGS={FCFLAGS} - #MPI_LDFLAGS= - #MPI_LIBS= --MPILIB_LDFLAGS=-Wc,-nolinkage - - # # Scalasca1 settings - # MPILIB = -diff --git a/build-config/common/platforms/compiler-mpi-intel3 b/build-config/common/platforms/compiler-mpi-intel3 -index 31e6893ea..961c97f1b 100644 ---- a/build-config/common/platforms/compiler-mpi-intel3 -+++ b/build-config/common/platforms/compiler-mpi-intel3 -@@ -16,7 +16,6 @@ MPI_FFLAGS={FFLAGS} - MPI_FCFLAGS={FCFLAGS} - #MPI_LDFLAGS= - #MPI_LIBS= --MPILIB_LDFLAGS=-Wc,-nolinkage - - # # Scalasca1 settings - # MPILIB = -diff --git a/build-config/common/platforms/compiler-mpi-oneapi b/build-config/common/platforms/compiler-mpi-oneapi -index 7c55835dc..8467f5fb6 100644 ---- a/build-config/common/platforms/compiler-mpi-oneapi -+++ b/build-config/common/platforms/compiler-mpi-oneapi -@@ -16,4 +16,3 @@ MPI_FFLAGS={FFLAGS} - MPI_FCFLAGS={FCFLAGS} - #MPI_LDFLAGS= - #MPI_LIBS= --MPILIB_LDFLAGS=-Wc,-nolinkage -diff --git a/build-config/common/platforms/platform-mpi-mic b/build-config/common/platforms/platform-mpi-mic -index 90ffa8f49..20e4edfe0 100644 ---- a/build-config/common/platforms/platform-mpi-mic -+++ b/build-config/common/platforms/platform-mpi-mic -@@ -14,4 +14,3 @@ MPI_FFLAGS=-g -O2 - MPI_FCFLAGS=-g -O2 - #MPI_LDFLAGS= - #MPI_LIBS= --MPILIB_LDFLAGS=-Wc,-nolinkage diff --git a/components/perf-tools/scorep/SPECS/scorep.spec b/components/perf-tools/scorep/SPECS/scorep.spec index 18f0c472bb..7a2212cb4a 100644 --- a/components/perf-tools/scorep/SPECS/scorep.spec +++ b/components/perf-tools/scorep/SPECS/scorep.spec @@ -18,13 +18,12 @@ Summary: Scalable Performance Measurement Infrastructure for Parallel Codes Name: %{pname}-%{compiler_family}-%{mpi_family}%{PROJ_DELIM} -Version: 10.0 +Version: 10.1 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 -Patch1: Score-P-10.0_fix-intel-mpi-linker-error.patch BuildRequires: automake BuildRequires: bison BuildRequires: binutils-devel @@ -69,7 +68,6 @@ This is the %{compiler_family}-%{mpi_family} version. %prep %setup -q -n %{pname}-%{version} -%patch -P 1 -p1 %build @@ -188,11 +186,6 @@ rm -f $RPM_BUILD_ROOT%{install_path}/lib/*.la rm -f $RPM_BUILD_ROOT%{install_path}/lib/*.a rm -f $RPM_BUILD_ROOT%{install_path}/lib/scorep/*.la -# symlink README.LICENSES.md to COPYING to work around broken scorep-info license in Score-P v10.0 -pushd $RPM_BUILD_ROOT%{install_path}/share/doc/scorep/ -ln -s README.LICENSES.md COPYING -popd - %if 0%{?suse_version} %fdupes -s %{buildroot}%{install_path} %endif diff --git a/components/serial-libs/opari2/SPECS/opari2.spec b/components/serial-libs/opari2/SPECS/opari2.spec index c6a9fc75d4..c9f0d5bf6d 100644 --- a/components/serial-libs/opari2/SPECS/opari2.spec +++ b/components/serial-libs/opari2/SPECS/opari2.spec @@ -17,7 +17,7 @@ Summary: An OpenMP runtime performance measurement instrumenter Name: %{pname}-%{compiler_family}%{PROJ_DELIM} -Version: 2.0.9 +Version: 2.0.10 Release: 1%{?dist} License: BSD-3-Clause Group: %{PROJ_NAME}/serial-libs diff --git a/tests/perf-tools/scorep/tests/test_module b/tests/perf-tools/scorep/tests/test_module index 4e3b640117..87ba5ee30e 100755 --- a/tests/perf-tools/scorep/tests/test_module +++ b/tests/perf-tools/scorep/tests/test_module @@ -124,8 +124,8 @@ teardown() { assert_success } -@test "[${TESTNAME}] Verify availability of COPYING for scorep (${LMOD_FAMILY_COMPILER}/${LMOD_FAMILY_MPI})" { +@test "[${TESTNAME}] Verify availability of README.LICENSES.md for scorep (${LMOD_FAMILY_COMPILER}/${LMOD_FAMILY_MPI})" { # Required for scorep-info license - run ls "${SCOREP_DIR}/share/doc/scorep/COPYING" + run ls "${SCOREP_DIR}/share/doc/scorep/README.LICENSES.md" assert_success }