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=c9ac3dad58d....
Change:
+%ifnarch ppc64le
Thanks.
Full change:
============
commit d609215c780b2d873578fb87df62a867b7a3e84d
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Thu Oct 25 12:16:15 2018 +0100
Un-bump release
diff --git a/scorep.spec b/scorep.spec
index afae444..d2724a7 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -8,7 +8,7 @@
Name: scorep
Version: 4.1
-Release: 3%{?dist}
+Release: 2%{?dist}
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes
License: BSD
@@ -239,7 +239,6 @@ find %{buildroot} -name '*.a' -delete
%ldconfig_scriptlets
%check
-# Fixme: failing with link errors
make -C serial check V=1
commit 8cf881736bbf32383a6ec196e65468ff3cedf383
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Thu Oct 25 11:51:57 2018 +0100
- Avoid rpath in scorep-config output
- Fix requires for MPI packages
- Move files required for Scalasca to -config packages
- Add license to libs packages
diff --git a/scorep.spec b/scorep.spec
index 801d747..afae444 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -8,7 +8,7 @@
Name: scorep
Version: 4.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes
License: BSD
@@ -78,17 +78,26 @@ The %{name}-doc package contains documentation for %{name}
%package libs
Summary: Score-P runtime libraries
+# This is useful at runtime.
+Requires: %{name}-config%{?_isa} = %{version}-%{release}
%description libs
Score-P runtime libraries.
+# This is relevant for Scalasca analysis, at least, without the libraries.
+%package config
+Summary: Score-P configuration files
+
+%description config
+Score-P configuration files.
+
%if %{with_mpich}
%package mpich
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes for
mpich
BuildRequires: mpich-devel
Requires: %{name}-mpich-libs%{?_isa} = %{version}-%{release}
-Requires: cube-devel%{?_isa} >= 4.3
-Requires: otf2-devel%{?_isa} >= 1.5
+Requires: cube-devel%{?_isa} >= 4.4
+Requires: otf2-devel%{?_isa} >= 2.0
Requires: papi-devel%{?_isa}
%description mpich
@@ -102,9 +111,16 @@ This package was compiled with mpich.
%package mpich-libs
Summary: Score-P mpich runtime libraries
+Requires: %{name}-mpich-config%{?_isa} = %{version}-%{release}
%description mpich-libs
Score-P mpich runtime libraries.
+
+%package mpich-config
+Summary: Score-P mpich configuration files
+
+%description mpich-config
+Score-P mpich configuration files.
%endif
@@ -113,8 +129,8 @@ Score-P mpich runtime libraries.
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes for
openmpi
BuildRequires: openmpi-devel
Requires: %{name}-openmpi-libs%{?_isa} = %{version}-%{release}
-Requires: cube-devel%{?_isa} >= 4.3
-Requires: otf2-devel%{?_isa} >= 1.5
+Requires: cube-devel%{?_isa} >= 4.4
+Requires: otf2-devel%{?_isa} >= 2.0
Requires: papi-devel%{?_isa}
%description openmpi
@@ -127,9 +143,16 @@ This package was compiled with openmpi.
%package openmpi-libs
Summary: Score-P openmpi runtime libraries
+Requires: %{name}-openmpi-config%{?_isa} = %{version}-%{release}
%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
@@ -155,6 +178,12 @@ 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' {} \;
+# This may not be the best way to eliminate rpath from the -config binaries.
+# rpmlint still complains, apparently about a string which doesn't
+# affect --ldflags or show up in chrpath -l. (The same as cof cube.)
+sed -i -e
's/HARDCODE_INTO_LIBS"]="1"/HARDCODE_INTO_LIBS"]="0"/'
\
+ -e "s/hardcode_into_libs='yes'/hardcode_into_libs='no'/" \
+ build-backend/config.status
make %{?_smp_mflags}
cd -
@@ -173,9 +202,13 @@ do
--libdir=%{_libdir}/$mpi/lib \
--bindir=%{_libdir}/$mpi/bin \
--sbindir=%{_libdir}/$mpi/sbin \
+ --datadir=%{_libdir}/$mpi/share \
--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' {} \;
+ sed -i -e
's/HARDCODE_INTO_LIBS"]="1"/HARDCODE_INTO_LIBS"]="0"/'
\
+ -e "s/hardcode_into_libs='yes'/hardcode_into_libs='no'/"
\
+ build-backend/config.status
make %{?_smp_mflags}
module purge
cd -
@@ -219,7 +252,6 @@ make -C serial check V=1
%{_defaultdocdir}/scorep/THANKS
%{_bindir}/scorep
%{_bindir}/scorep-backend-info
-%{_bindir}/scorep-config
%{_bindir}/scorep-g++
%{_bindir}/scorep-gcc
%{_bindir}/scorep-gfortran
@@ -230,7 +262,6 @@ make -C serial check V=1
%{_bindir}/scorep-preload-init
%{?dowrap:%{_bindir}/scorep-libwrap-init}
%{_libdir}/scorep/
-%{_datadir}/scorep/
%{_includedir}/scorep/
# Are the libtools in here necessary (different from vanilla)?
%{_libexecdir}/scorep
@@ -242,13 +273,17 @@ make -C serial check V=1
%license COPYING
%{_libdir}/libscorep_*.so*
+%files config
+%license COPYING
+%{_bindir}/scorep-config
+%{_datadir}/scorep/
+
%if %{with_mpich}
%files mpich
%license COPYING
%doc AUTHORS ChangeLog README THANKS OPEN_ISSUES
%{_libdir}/mpich/bin/scorep
%{_libdir}/mpich/bin/scorep-backend-info
-%{_libdir}/mpich/bin/scorep-config
%{_libdir}/mpich/bin/scorep-g++
%{_libdir}/mpich/bin/scorep-gcc
%{_libdir}/mpich/bin/scorep-gfortran
@@ -266,7 +301,13 @@ make -C serial check V=1
%{_includedir}/mpich-%{_arch}/scorep/
%files mpich-libs
+%license COPYING
%{_libdir}/mpich/lib/*.so*
+
+%files mpich-config
+%license COPYING
+%{_libdir}/mpich/bin/scorep-config
+%{_libdir}/mpich/share/scorep
%endif
%if %{with_openmpi}
@@ -275,7 +316,6 @@ make -C serial check V=1
%doc AUTHORS ChangeLog README THANKS OPEN_ISSUES
%{_libdir}/openmpi/bin/scorep
%{_libdir}/openmpi/bin/scorep-backend-info
-%{_libdir}/openmpi/bin/scorep-config
%{_libdir}/openmpi/bin/scorep-g++
%{_libdir}/openmpi/bin/scorep-gcc
%{_libdir}/openmpi/bin/scorep-gfortran
@@ -295,10 +335,22 @@ make -C serial check V=1
%{_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
%changelog
+* 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
commit 1dd420804af70c8dd3d1921ecc46a23c76e4a096
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Sat Oct 20 14:47:21 2018 +0100
- New version
- Remove 64-bit install fixup
diff --git a/.gitignore b/.gitignore
index dae43eb..14babd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/scorep-3.0.tar.gz
/scorep-3.1.tar.gz
/scorep-4.0.tar.gz
+/scorep-4.1.tar.gz
diff --git a/sources b/sources
index 017b1c7..46a2ea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scorep-4.0.tar.gz) =
f5ad9c777eae022378e0ae15a83b46e4b406e7453e2b26053064528207684d21c4b6306037387b852bf9cbf84d233c2c4bb766faf17dba3567f68975eae99ec7
+SHA512 (scorep-4.1.tar.gz) =
11a86c70b3d7b7741e8309b7864c73496786eefa43b22f6ea5d1db63eb1defd6ed5568f87794bf66e8b79ac8c9112b215527102a5d01adfb30b709e1f0e30ea6
commit b0936f106baa40ab6b1663f50216ca6d125dfafa
Merge: c9ac3da b259a12
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Thu Oct 18 16:37:41 2018 +0100
- New version
- Remove 64-bit install fixup
commit c9ac3dad58d2c5d5047718db4dda90c5fef23ee0
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Mon Oct 15 14:07:55 2018 +0100
- New version
- Remove 64-bit install fixup
diff --git a/scorep.spec b/scorep.spec
index eb27e45..9586b0a 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -1,6 +1,14 @@
+%ifnarch ppc64le
+%global dowrap 1
+%else
+%if 0%{?fedora} > 28
+%global dowrap 1
+%endif
+%endif
+
Name: scorep
-Version: 4.0
-Release: 2%{?dist}
+Version: 4.1
+Release: 1%{?dist}
Summary: Scalable Performance Measurement Infrastructure for Parallel Codes
License: BSD
@@ -19,9 +27,11 @@ 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}
@@ -193,11 +203,6 @@ done
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -delete
-# Fixme: For some reason libscorep_estimator is always installed in lib
-if [ %_lib != lib ]; then
- mv %{buildroot}%{_prefix}/lib/libscorep* %{buildroot}%{_libdir}
-fi
-
%ldconfig_scriptlets
%check
@@ -223,7 +228,7 @@ make -C serial check V=1
%{_bindir}/scorep-wrapper
%{_bindir}/scorep-online-access-registry
%{_bindir}/scorep-preload-init
-%{_bindir}/scorep-libwrap-init
+%{?dowrap:%{_bindir}/scorep-libwrap-init}
%{_libdir}/scorep/
%{_datadir}/scorep/
%{_includedir}/scorep/
@@ -256,7 +261,7 @@ make -C serial check V=1
%{_libdir}/mpich/bin/scorep-wrapper
%{_libdir}/mpich/bin/scorep-online-access-registry
%{_libdir}/mpich/bin/scorep-preload-init
-%{_libdir}/mpich/bin/scorep-libwrap-init
+%{?dowrap:%{_libdir}/mpich/bin/scorep-libwrap-init}
%{_libdir}/mpich/lib/scorep/
%{_includedir}/mpich-%{_arch}/scorep/
@@ -285,7 +290,7 @@ make -C serial check V=1
%{_libdir}/openmpi/bin/scorep-wrapper
%{_libdir}/openmpi/bin/scorep-online-access-registry
%{_libdir}/openmpi/bin/scorep-preload-init
-%{_libdir}/openmpi/bin/scorep-libwrap-init
+%{?dowrap:%{_libdir}/openmpi/bin/scorep-libwrap-init}
%{_libdir}/openmpi/lib/scorep/
%{_includedir}/openmpi-%{_arch}/scorep/
@@ -294,7 +299,14 @@ make -C serial check V=1
%endif
%changelog
-* Tue Oct 9 2018 Dave Love <loveshack(a)fedoraproject.org> - 4.0-2
+* 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