The package rpms/scorep.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/scorep.git/commit/?id=fb05764ea16...
https://src.fedoraproject.org/cgit/rpms/scorep.git/commit/?id=f7fa375be97...
https://src.fedoraproject.org/cgit/rpms/scorep.git/commit/?id=5399d26c73f....
Change:
-%ifarch ppc64le
+%ifarch ppc64
+%ifarch ppc64
Thanks.
Full change:
============
commit fb05764ea16d93b1ffddf29047f47669e994faec
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Tue Sep 3 09:18:02 2019 +0000
- Add openmpi3 variant on el7
- Fix logic for mpi running in %check
- Specify cube and opari version requirements
diff --git a/scorep.spec b/scorep.spec
index 36a3783..b9b49d0 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -1,11 +1,6 @@
-%ifarch ppc64le
-# Only these have llvm >= 6
-%if 0%{?fedora}%{?el8}
-%global dowrap 1
-%endif
-%else
-%global dowrap 1
-%endif
+# Only these have llvm/clang >= 6. x86_64 el7 has llvm7.0, but not
+# clang7.0; it has llvm-toolset-7, but not available in koji.
+%global dowrap 0%{?fedora}%{?el8}
# OMPI4 oshcc is now not on all arches (depending on UCX)
%global oshm 1
@@ -28,10 +23,10 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: binutils-devel
BuildRequires: chrpath
-BuildRequires: cube-libs-devel
+BuildRequires: cube-libs-devel >= 4.4
BuildRequires: libunwind-devel
BuildRequires: ocl-icd-devel
-BuildRequires: opari2
+BuildRequires: opari2 >= 2.0
BuildRequires: otf2-devel >= 2.0
BuildRequires: papi-devel
BuildRequires: gcc-plugin-devel
@@ -44,12 +39,12 @@ BuildRequires: clang-devel
BuildRequires: automake libtool
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: binutils-devel%{?_isa}
-Requires: cube-libs-devel%{?_isa}
+Requires: cube-libs-devel%{?_isa} >= 4.4
Requires: otf2-devel%{?_isa} >= 2.2
Requires: papi-devel%{?_isa}
Requires: libunwind-devel%{?_isa}
Requires: ocl-icd-devel%{?_isa}
-Requires: opari2%{?_isa}
+Requires: opari2%{?_isa} >= 2.0
# Missing papi and libunwind
ExcludeArch: s390 s390x
@@ -204,6 +199,13 @@ Summary: Score-P openmpi3 runtime libraries
%description openmpi3-libs
Score-P openmpi3 runtime libraries.
+Requires: %{name}-openmpi-config%{?_isa} = %{version}-%{release}
+
+%package openmpi3-config
+Summary: Score-P openmpi3 configuration files
+
+%description openmpi3-config
+Score-P openmpi3 configuration files.
%endif
@@ -213,7 +215,7 @@ Score-P openmpi3 runtime libraries.
rm -rf vendor/{opari2,otf2,cubew,cubelib}
mkdir bin
# configure expects llvm-config
-ln -s %_bindir/llvm-config-%_isa_bits bin/llvm-config
+ln -s %_bindir/llvm-config-%__isa_bits bin/llvm-config
%patch1 -p1 -b .rpath
@@ -279,13 +281,16 @@ done
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -delete
-%ldconfig_scriptlets
+
+%ldconfig_scriptlets libs
%check
%if %{with_openmpi}
-make -C serial check V=1
-%else
+%_openmpi_load
+OMPI_MCA_rmaps_base_oversubscribe=1 \
make -C openmpi check V=1
+%else
+make -C serial check V=1
%endif
@@ -302,7 +307,9 @@ make -C openmpi check V=1
%{_bindir}/scorep-wrapper
%{_bindir}/scorep-online-access-registry
%{_bindir}/scorep-preload-init
-%{?dowrap:%{_bindir}/scorep-libwrap-init}
+%if %{dowrap}
+%{_bindir}/scorep-libwrap-init
+%endif
%{_libdir}/scorep/
%{_includedir}/scorep/
# Are the libtools in here necessary (different from vanilla)?
@@ -338,7 +345,9 @@ make -C openmpi check V=1
%{_libdir}/mpich/bin/scorep-wrapper
%{_libdir}/mpich/bin/scorep-online-access-registry
%{_libdir}/mpich/bin/scorep-preload-init
-%{?dowrap:%{_libdir}/mpich/bin/scorep-libwrap-init}
+%if %{dowrap}
+%{_libdir}/mpich/bin/scorep-libwrap-init
+%endif
%{_libdir}/mpich/lib/scorep/
%{_includedir}/mpich-%{_arch}/scorep/
@@ -368,14 +377,16 @@ make -C openmpi check V=1
%{_libdir}/openmpi/bin/scorep-mpif90
%if %oshm
%{_libdir}/openmpi/bin/scorep-oshcc
-%{_libdir}/openmpi/bin/scorep-oshcxx
+%{!?el7:%{_libdir}/openmpi/bin/scorep-oshcxx}
%{_libdir}/openmpi/bin/scorep-oshfort
%endif
%{_libdir}/openmpi/bin/scorep-score
%{_libdir}/openmpi/bin/scorep-wrapper
%{_libdir}/openmpi/bin/scorep-online-access-registry
%{_libdir}/openmpi/bin/scorep-preload-init
-%{?dowrap:%{_libdir}/openmpi/bin/scorep-libwrap-init}
+%if %{dowrap}
+%{_libdir}/openmpi/bin/scorep-libwrap-init
+%endif
%{_libdir}/openmpi/lib/scorep/
%{_includedir}/openmpi-%{_arch}/scorep/
@@ -393,21 +404,41 @@ make -C openmpi check V=1
%files openmpi3
%license COPYING
%doc AUTHORS ChangeLog README THANKS OPEN_ISSUES
-%{_libdir}/openmpi3/bin/online-access-registry
%{_libdir}/openmpi3/bin/scorep
%{_libdir}/openmpi3/bin/scorep-backend-info
-%{_libdir}/openmpi3/bin/scorep-config
+%{_libdir}/openmpi3/bin/scorep-g++
+%{_libdir}/openmpi3/bin/scorep-gcc
+%{_libdir}/openmpi3/bin/scorep-gfortran
%{_libdir}/openmpi3/bin/scorep-info
+%{_libdir}/openmpi3/bin/scorep-mpicc
+%{_libdir}/openmpi3/bin/scorep-mpicxx
+%{_libdir}/openmpi3/bin/scorep-mpif77
+%{_libdir}/openmpi3/bin/scorep-mpif90
+%{_libdir}/openmpi3/bin/scorep-oshcc
+%{_libdir}/openmpi3/bin/scorep-oshcxx
+%{_libdir}/openmpi3/bin/scorep-oshfort
%{_libdir}/openmpi3/bin/scorep-score
+%{_libdir}/openmpi3/bin/scorep-wrapper
+%{_libdir}/openmpi3/bin/scorep-online-access-registry
+%{_libdir}/openmpi3/bin/scorep-preload-init
+%{_libdir}/openmpi3/lib/scorep/
%{_includedir}/openmpi3-%{_arch}/scorep/
%files openmpi3-libs
%{_libdir}/openmpi3/lib/*.so*
+
+%files openmpi3-config
+%license COPYING
+%{_libdir}/openmpi3/bin/scorep-config
+%{_libdir}/openmpi3/share/scorep
%endif
+
%changelog
* Fri Aug 30 2019 Dave love <loveshack(a)fedoraproject.org> - 6.0-4
- Add openmpi3 variant on el7
+- Fix logic for mpi running in %%check
+- Specify cube and opari version requirements
* Wed Aug 28 2019 Dave love <loveshack(a)fedoraproject.org> - 6.0-3
- BR libunwind on el8 again (now in EPEL)
commit f7fa375be97ec7f024974e9e091a6f513a655da8
Merge: 985f380 2754089
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Fri Aug 30 09:56:45 2019 +0000
Merge branch 'master' into epel7
Conflicts:
scorep.spec
diff --cc scorep.spec
index 2bc8e28,5b15b9c..36a3783
--- a/scorep.spec
+++ b/scorep.spec
@@@ -1,64 -1,77 +1,93 @@@
+ %ifarch ppc64le
+ # Only these have llvm >= 6
+ %if 0%{?fedora}%{?el8}
+ %global dowrap 1
+ %endif
+ %else
+ %global dowrap 1
+ %endif
+
+ # OMPI4 oshcc is now not on all arches (depending on UCX)
+ %global oshm 1
+ %if 0%{?fedora} > 30
+ %ifnarch aarch64 ppc64le x86_64
+ %global oshm 0
+ %endif
+ %endif
+
Name: scorep
- Version: 1.4.2
- Release: 7%{?dist}
+ Version: 6.0
-Release: 3%{?dist}
++Release: 4%{?dist}
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes
-
License: BSD
URL:
http://www.vi-hps.org/projects/score-p/
- Source0:
http://www.vi-hps.org/upload/packages/%{name}/%{name}-%{version}.tar.gz
- # Fix getaddrinfo() feature test
- Patch0: scorep-getaddrinfo.patch
+ Source0:
https://www.vi-hps.org/cms/upload/packages/%{name}/%{name}-%{version}.tar.gz
+ Patch1: scorep-rpath.patch
BuildRequires: gcc-gfortran
BuildRequires: bison
BuildRequires: flex
BuildRequires: binutils-devel
BuildRequires: chrpath
- BuildRequires: cube-devel >= 4.3
+ BuildRequires: cube-libs-devel
+ BuildRequires: libunwind-devel
+ BuildRequires: ocl-icd-devel
BuildRequires: opari2
- BuildRequires: otf2-devel >= 1.4
+ BuildRequires: otf2-devel >= 2.0
BuildRequires: papi-devel
+ BuildRequires: gcc-plugin-devel
+ BuildRequires: gcc-c++
+ %if 0%{?dowrap}
+ BuildRequires: llvm-devel
+ BuildRequires: clang
+ BuildRequires: clang-devel
+ %endif
+ BuildRequires: automake libtool
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: binutils-devel%{?_isa}
- Requires: cube-devel%{?_isa} >= 4.3
- Requires: otf2-devel%{?_isa} >= 1.5
+ Requires: cube-libs-devel%{?_isa}
+ Requires: otf2-devel%{?_isa} >= 2.2
Requires: papi-devel%{?_isa}
+ Requires: libunwind-devel%{?_isa}
+ Requires: ocl-icd-devel%{?_isa}
+ Requires: opari2%{?_isa}
+ # Missing papi and libunwind
+ ExcludeArch: s390 s390x
+# Work around
https://bugzilla.redhat.com/show_bug.cgi?id=1365792
+%{?filter_setup:
+%filter_from_requires /liboshmem\.so.8/d
+%filter_setup
+}
+
%global with_mpich 1
%global with_openmpi 1
- %ifarch s390 s390x
- # No openmpi on s390(x)
- %global with_openmpi 0
- %endif
- # No mpich on EL6 ppc64
- %ifarch ppc64
- %if 0%{?rhel} && 0%{?rhel} <= 6
- %global with_mpich 0
- %endif
- %endif
+# el7 has both 1.10 and 3.0, except on ppc64
+%ifarch ppc64
+%global with_openmpi3 0
+%else
+%global with_openmpi3 0%{?el7}
+%endif
+
%if %{with_mpich}
%global mpi_list mpich
%endif
%if %{with_openmpi}
%global mpi_list %{?mpi_list} openmpi
%endif
+%if %{with_openmpi3}
+%global mpi_list %{?mpi_list} openmpi3
+%endif
+ # Avoid missing symbol link errors in test
+ %undefine _ld_as_needed
+ # Avoid in test
+ # /usr/bin/ld: pomp_tpd_: TLS reference in ./.libs/libscorep_adapter_opari2_op
nmp_event.so mismatches non-TLS reference in jacobi_omp_f90-jacobi.mod.o
+ %undefine _hardened_build
+
+ %global __requires_exclude_from
^%{_libdir}(/(openmpi|mpich)/lib)?/libscorep_.*|^%{_docdir}/.*$
+
+
%description
The Score-P (Scalable Performance Measurement Infrastructure for
Parallel Codes) measurement infrastructure is a highly scalable and
@@@ -128,32 -158,14 +174,38 @@@ Requires: %{name}-openmpi-config%
%description openmpi-libs
Score-P openmpi runtime libraries.
+
+ %package openmpi-config
+ Summary: Score-P openmpi configuration files
+
+ %description openmpi-config
+ Score-P openmpi configuration files.
%endif
+%if %{with_openmpi3}
+%package openmpi3
+Summary: Scalable Performance Measurement Infrastructure for Parallel Codes for
openmpi3
+BuildRequires: openmpi3-devel
+Requires: %{name}-openmpi3-libs%{?_isa} = %{version}-%{release}
+Requires: cube-devel%{?_isa}
+Requires: otf2-devel%{?_isa}
+Requires: papi-devel%{?_isa}
+
+%description openmpi3
+The Score-P (Scalable Performance Measurement Infrastructure for
+Parallel Codes) measurement infrastructure is a highly scalable and
+easy-to-use tool suite for profiling, event trace recording, and
+online analysis of HPC applications.
+
+This package was compiled with openmpi3.
+
+%package openmpi3-libs
+Summary: Score-P openmpi3 runtime libraries
+
+%description openmpi3-libs
+Score-P openmpi3 runtime libraries.
+%endif
+
%prep
%setup -q
@@@ -286,32 -340,126 +380,151 @@@ make -C openmpi check V=
%{_includedir}/openmpi-%{_arch}/scorep/
%files openmpi-libs
+ %license COPYING
%{_libdir}/openmpi/lib/*.so*
+
+ %files openmpi-config
+ %license COPYING
+ %{_libdir}/openmpi/bin/scorep-config
+ %{_libdir}/openmpi/share/scorep
%endif
+%if %{with_openmpi3}
+%files openmpi3
+%license COPYING
+%doc AUTHORS ChangeLog README THANKS OPEN_ISSUES
+%{_libdir}/openmpi3/bin/online-access-registry
+%{_libdir}/openmpi3/bin/scorep
+%{_libdir}/openmpi3/bin/scorep-backend-info
+%{_libdir}/openmpi3/bin/scorep-config
+%{_libdir}/openmpi3/bin/scorep-info
+%{_libdir}/openmpi3/bin/scorep-score
+%{_includedir}/openmpi3-%{_arch}/scorep/
+
+%files openmpi3-libs
+%{_libdir}/openmpi3/lib/*.so*
+%endif
+
%changelog
++* Fri Aug 30 2019 Dave love <loveshack(a)fedoraproject.org> - 6.0-4
++- Add openmpi3 variant on el7
++
+ * Wed Aug 28 2019 Dave love <loveshack(a)fedoraproject.org> - 6.0-3
+ - BR libunwind on el8 again (now in EPEL)
+
+ * Mon Aug 19 2019 Dave love <loveshack(a)fedoraproject.org> - 6.0-2
+ - Don't BR libunwind on el8
+
+ * Thu Aug 1 2019 Dave Love <loveshack(a)fedoraproject.org> - 6.0-1
+ - New version
+ - BR otf2 >= 2.2
+
+ * Mon Jul 29 2019 Dave Love <loveshack(a)fedoraproject.org> - 5.0-4
+ - Bump release to try to trigger rebuild
+
+ * Sat Jul 27 2019 Dave Love <loveshack(a)fedoraproject.org> - 5.0-3
+ - armv7hl: build libwrap-init again
+ - Conditionalize osh... wrappers
+
+ * Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0-2
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+ * Mon Mar 25 2019 Dave Love <loveshack(a)fedoraproject.org> - 5.0-1
+ - New version
+ - Update source URL
+
+ * Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 4.1-6
+ - Rebuild for openmpi 3.1.3
+
+ * Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.1-5
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Dec 3 2018 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
+- Add openmpi3 variant on el7
+
+ * Fri Nov 30 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.1-4
+ - BR cube-libs-devel, not cube-devel
+
+ * Mon Oct 29 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.1-3
+ - Replace rpath hard-coding with patch, not configure fiddle
+ - Filter requires
+
+ * Tue Oct 23 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.1-2
+ - Avoid rpath in scorep-config output
+ - Fix requires for MPI packages
+ - Move files required for Scalasca to -config packages
+ - Add license to libs packages
+
+ * Fri Oct 12 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.1-1
+ - New version
+ - Remove 64-bit install fixup
+
+ * Fri Oct 12 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.0-3
+ - Exclude libwrap stuff on ppc64le fedora < 29
+
+ * Tue Oct 9 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.0-2
+ - Use ldconfig_scriptlets and remove some EPEL-ism in build
+ - Patch to correct cube configuration
+ - Build libwrap
+ - Undefine _ld_as_needed, _hardened_build to make %%check work
+ - Require libunwind-devel, ocl-icd-devel, opari2 [#1610849]
+
+ * Wed Jul 25 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.0-1
+ - New version (#1606317, #1574496); soname bump affects old binaries
+ - Remove bundled cubew, cubelib
+ - Account for _libdir being partially ignored
+ - Maybe BR gcc-plugin-devel
+
+ * Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-7
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+ * Thu Feb 15 2018 Dave Love <loveshack(a)fedoraproject.org> - 3.1-6
+ - Fix check for getaddrinfo; install scorep-online-access-registry
+
+ * Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-5
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+ * Thu Aug 03 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-4
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+ * Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1-3
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+ * Sun Jun 4 2017 Dave Love <loveshack(a)fedoraproject.org> - 3.1-2
+ - Remove useless s390 conditional
+
+ * Wed May 31 2017 Dave Love <loveshack(a)fedoraproject.org> - 3.1-1
+ - Update to 3.1 (#1457285)
+ - Exclude s390, s390x
+
+ * Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.0-5
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+ * Fri Feb 3 2017 Orion Poplawski <orion(a)cora.nwra.com> - 3.0-4
+ - Enable libunwind and OpenCL support
+
+ * Tue Jan 31 2017 Orion Poplawski <orion(a)cora.nwra.com> - 3.0-3
+ - Rebuild for gcc 7
+
+* Mon Oct 31 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
+- Work around install failure on RHEL 7.2 (bz#1365792)
+
+ * Fri Oct 21 2016 Orion Poplawski <orion(a)cora.nwra.com> - 3.0-2
+ - Rebuild for openmpi 2.0
+
+ * Tue Sep 20 2016 Orion Poplawski <orion(a)cora.nwra.com> - 3.0-1
+ - Update to 3.0
+
+ * Thu Sep 15 2016 Orion Poplawski <orion(a)cora.nwra.com> - 2.0.2-2
+ - Rebuild for papi 5.5.0
+ - Force scorep_platform to be "linux"
+
+ * Tue May 24 2016 Orion Poplawski <orion(a)cora.nwra.com> - 2.0.2-1
+ - Update to 2.0.2
+
+ * Fri Apr 15 2016 Orion Poplawski <orion(a)cora.nwra.com> - 2.0.1-1
+ - Update to 2.0.1
+
* Fri Feb 19 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-6
- Link against papi-5.1.1 on el6
- Link --as-needed (see previous rpmlint warnings)
commit 985f380ab0c5346bad44e4e6c8199b612e13cc6a
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Wed Dec 5 14:56:36 2018 +0000
Avoid smp make
diff --git a/scorep.spec b/scorep.spec
index d1345d2..2bc8e28 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -179,7 +179,8 @@ mkdir serial
cd serial
%configure %{configure_opts} --without-mpi --without-shmem
find -name Makefile -exec sed -r -i 's,-L%{_libdir}/?( |$),,g;s,-L/usr/lib/../%{_lib}
,,g' {} \;
-make %{?_smp_mflags}
+# Seems not to be smp-safe
+make
cd -
# Build MPI versions
@@ -200,7 +201,7 @@ do
--includedir=%{_includedir}/$mpi-%{_arch} \
--mandir=%{_libdir}/$mpi/share/man
find -name Makefile -exec sed -r -i 's,-L%{_libdir}/?(
|$),,g;s,-L/usr/lib/../%{_lib} ,,g' {} \;
- make %{?_smp_mflags}
+ make
module purge
cd -
done
commit 5399d26c73f73012c7ef12addd52c4dec93868a0
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Wed Dec 5 14:19:26 2018 +0000
Avoid openmpi3 on ppc64
diff --git a/scorep.spec b/scorep.spec
index bd0e48f..d1345d2 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -42,8 +42,12 @@ Requires: papi-devel%{?_isa}
%endif
%endif
-# el7 has both 1.10 and 3.0
+# el7 has both 1.10 and 3.0, except on ppc64
+%ifarch ppc64
+%global with_openmpi3 0
+%else
%global with_openmpi3 0%{?el7}
+%endif
%if %{with_mpich}
%global mpi_list mpich
commit e4288ac88e724bc7c93159246887c33fd9a2e32f
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Tue Dec 4 17:22:26 2018 +0000
- Add openmpi3 variant on el7
diff --git a/scorep.spec b/scorep.spec
index 90648d9..bd0e48f 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -42,12 +42,18 @@ Requires: papi-devel%{?_isa}
%endif
%endif
+# el7 has both 1.10 and 3.0
+%global with_openmpi3 0%{?el7}
+
%if %{with_mpich}
%global mpi_list mpich
%endif
%if %{with_openmpi}
%global mpi_list %{?mpi_list} openmpi
%endif
+%if %{with_openmpi3}
+%global mpi_list %{?mpi_list} openmpi3
+%endif
%description
The Score-P (Scalable Performance Measurement Infrastructure for
@@ -120,6 +126,30 @@ Summary: Score-P openmpi runtime libraries
Score-P openmpi runtime libraries.
%endif
+%if %{with_openmpi3}
+%package openmpi3
+Summary: Scalable Performance Measurement Infrastructure for Parallel Codes for
openmpi3
+BuildRequires: openmpi3-devel
+Requires: %{name}-openmpi3-libs%{?_isa} = %{version}-%{release}
+Requires: cube-devel%{?_isa}
+Requires: otf2-devel%{?_isa}
+Requires: papi-devel%{?_isa}
+
+%description openmpi3
+The Score-P (Scalable Performance Measurement Infrastructure for
+Parallel Codes) measurement infrastructure is a highly scalable and
+easy-to-use tool suite for profiling, event trace recording, and
+online analysis of HPC applications.
+
+This package was compiled with openmpi3.
+
+%package openmpi3-libs
+Summary: Score-P openmpi3 runtime libraries
+
+%description openmpi3-libs
+Score-P openmpi3 runtime libraries.
+%endif
+
%prep
%setup -q
@@ -254,7 +284,26 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/openmpi/lib/*.so*
%endif
+%if %{with_openmpi3}
+%files openmpi3
+%license COPYING
+%doc AUTHORS ChangeLog README THANKS OPEN_ISSUES
+%{_libdir}/openmpi3/bin/online-access-registry
+%{_libdir}/openmpi3/bin/scorep
+%{_libdir}/openmpi3/bin/scorep-backend-info
+%{_libdir}/openmpi3/bin/scorep-config
+%{_libdir}/openmpi3/bin/scorep-info
+%{_libdir}/openmpi3/bin/scorep-score
+%{_includedir}/openmpi3-%{_arch}/scorep/
+
+%files openmpi3-libs
+%{_libdir}/openmpi3/lib/*.so*
+%endif
+
%changelog
+* Mon Dec 3 2018 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
+- Add openmpi3 variant on el7
+
* Mon Oct 31 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
- Work around install failure on RHEL 7.2 (bz#1365792)
commit 4ed293083bcd4085187639d6245c6c5d1b83da44
Author: Dave Love <d.love(a)liverpool.ac.uk>
Date: Mon Oct 31 14:28:11 2016 +0000
Work around install failure on RHEL 7.2 (bz#1365792)
diff --git a/scorep.spec b/scorep.spec
index ca63c03..90648d9 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -23,6 +23,12 @@ Requires: cube-devel%{?_isa} >= 4.3
Requires: otf2-devel%{?_isa} >= 1.5
Requires: papi-devel%{?_isa}
+# Work around
https://bugzilla.redhat.com/show_bug.cgi?id=1365792
+%{?filter_setup:
+%filter_from_requires /liboshmem\.so.8/d
+%filter_setup
+}
+
%global with_mpich 1
%global with_openmpi 1
%ifarch s390 s390x
@@ -249,8 +255,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%endif
%changelog
-* Fri Feb 19 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
-- Sync el6 and master
+* Mon Oct 31 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
+- Work around install failure on RHEL 7.2 (bz#1365792)
* Fri Feb 19 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-6
- Link against papi-5.1.1 on el6
commit 259283c358b5a285d62864858d2abd70240a7939
Merge: 524ceee 4a472a2
Author: Dave Love <d.love(a)liverpool.ac.uk>
Date: Fri Feb 19 18:01:00 2016 +0000
Sync el6 and master
diff --cc scorep.spec
index 5fbb0ea,4082620..ca63c03
--- a/scorep.spec
+++ b/scorep.spec
@@@ -1,6 -1,6 +1,6 @@@
Name: scorep
Version: 1.4.2
- Release: 2%{?dist}
-Release: 6%{?dist}
++Release: 7%{?dist}
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes
License: BSD
@@@ -240,9 -249,27 +249,30 @@@ find %{buildroot} -name '*.la' -exec r
%endif
%changelog
++* Fri Feb 19 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-7
++- Sync el6 and master
++
+ * Fri Feb 19 2016 Dave Love <loveshack(a)fedoraproject.org> - 1.4.2-6
+ - Link against papi-5.1.1 on el6
+ - Link --as-needed (see previous rpmlint warnings)
+ - Install OPEN_ISSUES as doc
+ - Use -std=gnu++98 for gcc6
+
+ * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.2-5
+ - Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+ * Wed Jan 27 2016 Orion Poplawski <orion(a)cora.nwra.com> - 1.4.2-4
+ - Rebuild for papi 5.4.3
+
+ * Wed Sep 16 2015 Orion Poplawski <orion(a)cora.nwra.com> - 1.4.2-3
+ - Rebuild for openmpi 1.10.0
+
-* Wed Aug 12 2015 Orion Poplawski <orion(a)cora.nwra.com> - 1.4.2-3
-- Add patch to handle glibc 2.22 change to getaddrinfo() exposure
+* Mon Aug 10 2015 Dave Love <d.love(a)liverpool.ac.uk> - 1.4.2-2
+- Rebuild for updated cube
+ * Sun Jul 26 2015 Sandro Mani <manisandro(a)gmail.com> - 1.4.2-2
+ - Rebuild for RPM MPI Requires Provides Change
+
* Fri Jun 19 2015 Orion Poplawski <orion(a)cora.nwra.com> - 1.4.2-1
- Update to 1.4.2
commit 524ceee93106a77aa0c34f36b43f6986ed5cabec
Author: Dave Love <d.love(a)liverpool.ac.uk>
Date: Mon Aug 10 15:05:10 2015 +0100
Rebuild for updated cube
diff --git a/scorep.spec b/scorep.spec
index 15a71aa..5fbb0ea 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -1,6 +1,6 @@
Name: scorep
Version: 1.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes
License: BSD
@@ -240,6 +240,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%endif
%changelog
+* Mon Aug 10 2015 Dave Love <d.love(a)liverpool.ac.uk> - 1.4.2-2
+- Rebuild for updated cube
+
* Fri Jun 19 2015 Orion Poplawski <orion(a)cora.nwra.com> - 1.4.2-1
- Update to 1.4.2