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=7a0833b6e18....
Change:
-%ifarch ppc64
Thanks.
Full change:
============
commit 7a0833b6e186f297d92e50a37032c72d9dc8a8a9
Author: Dave Love <loveshack(a)fedoraproject.org>
Date: Wed Oct 10 11:07:51 2018 +0100
- Use ldconfig_scriptlets and remove some EPEL-ism in build
- Patch to correct cube configuration
- Build libwrap
- Require opari2, libunwind-devel, ocl-icd-devel
- Undefine _ld_as_needed, _hardened_build to make %check work
diff --git a/scorep.spec b/scorep.spec
index b815108..eb27e45 100644
--- a/scorep.spec
+++ b/scorep.spec
@@ -1,12 +1,11 @@
Name: scorep
Version: 4.0
-Release: 1%{?dist}
+Release: 2%{?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
-BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
BuildRequires: bison
BuildRequires: flex
@@ -18,25 +17,25 @@ BuildRequires: ocl-icd-devel
BuildRequires: opari2
BuildRequires: otf2-devel >= 2.0
BuildRequires: papi-devel
-BuildRequires: %{!?el6:gcc-plugin-devel}
+BuildRequires: gcc-plugin-devel
BuildRequires: gcc-c++
-#BuildRequires: llvm-devel
+BuildRequires: llvm-devel
+BuildRequires: clang
+BuildRequires: clang-devel
+BuildRequires: automake libtool
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: binutils-devel%{?_isa}
Requires: cube-devel%{?_isa} >= 4.4
Requires: otf2-devel%{?_isa} >= 2.0
Requires: papi-devel%{?_isa}
+Requires: libunwind-devel%{?_isa}
+Requires: ocl-icd-devel%{?_isa}
+Requires: opari%{?_isa}
# Missing papi and libunwind
ExcludeArch: s390 s390x
%global with_mpich 1
%global with_openmpi 1
-# No mpich on EL6 ppc64
-%ifarch ppc64
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%global with_mpich 0
-%endif
-%endif
%if %{with_mpich}
%global mpi_list mpich
@@ -45,6 +44,13 @@ ExcludeArch: s390 s390x
%global mpi_list %{?mpi_list} openmpi
%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
+
+
%description
The Score-P (Scalable Performance Measurement Infrastructure for
Parallel Codes) measurement infrastructure is a highly scalable and
@@ -121,21 +127,16 @@ Score-P openmpi runtime libraries.
%setup -q
# Bundled libs in vendor/
rm -rf vendor/{opari2,otf2,cubew,cubelib}
+mkdir bin
+# configure expects llvm-config
+ln -s %_bindir/llvm-config-%_isa_bits bin/llvm-config
%build
%global _configure ../configure
-# required for gcc6
-export CXXFLAGS=-std=gnu++98
-# Required to get the online support in recent glibc. (Patching and
-# rebuilding configure falls fould of missing
-# AC_CONFIG_SUBDIR_CUSTOM.) Reported upstream.
-export CPPFLAGS='-D_POSIX_C_SOURCE=201112L'
-# The messging with linkage paths here and below is due to the mess of
-# the papi package there. %%_libdir/libpapi.so is papi v4 with a
-# soname of libpapi.so (bz #1300664).
-export LDFLAGS='-Wl,--as-needed -L%{_libdir}/papi-5.1.1/usr/lib'
-%global configure_opts ac_scorep_platform=linux --enable-shared --disable-static
--disable-silent-rules %{?el6:--with-papi-header=%{_libdir}/papi-5.1.1%{_includedir}
--with-papi-lib=%{_libdir}/papi-5.1.1/usr/lib}
+# See above
+PATH=$(pwd)/bin:$PATH
+%global configure_opts ac_scorep_platform=linux --enable-shared --disable-static
--disable-silent-rules CC=gcc CXX=g++
cp /usr/lib/rpm/redhat/config.{sub,guess} build-config/
@@ -197,14 +198,14 @@ if [ %_lib != lib ]; then
mv %{buildroot}%{_prefix}/lib/libscorep* %{buildroot}%{_libdir}
fi
+%ldconfig_scriptlets
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%check
+# Fixme: failing with link errors
+make -C serial check V=1
%files
-%{!?_licensedir:%global license %%doc}
%license COPYING
%dir %{_defaultdocdir}/scorep
%{_defaultdocdir}/scorep/AUTHORS
@@ -222,10 +223,12 @@ fi
%{_bindir}/scorep-wrapper
%{_bindir}/scorep-online-access-registry
%{_bindir}/scorep-preload-init
+%{_bindir}/scorep-libwrap-init
%{_libdir}/scorep/
%{_datadir}/scorep/
%{_includedir}/scorep/
-%{_libexecdir}/scorep/
+# Are the libtools in here necessary (different from vanilla)?
+%{_libexecdir}/scorep
%files doc
%{_defaultdocdir}/scorep/
@@ -253,6 +256,7 @@ fi
%{_libdir}/mpich/bin/scorep-wrapper
%{_libdir}/mpich/bin/scorep-online-access-registry
%{_libdir}/mpich/bin/scorep-preload-init
+%{_libdir}/mpich/bin/scorep-libwrap-init
%{_libdir}/mpich/lib/scorep/
%{_includedir}/mpich-%{_arch}/scorep/
@@ -281,6 +285,7 @@ fi
%{_libdir}/openmpi/bin/scorep-wrapper
%{_libdir}/openmpi/bin/scorep-online-access-registry
%{_libdir}/openmpi/bin/scorep-preload-init
+%{_libdir}/openmpi/bin/scorep-libwrap-init
%{_libdir}/openmpi/lib/scorep/
%{_includedir}/openmpi-%{_arch}/scorep/
@@ -289,6 +294,13 @@ fi
%endif
%changelog
+* 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
+- Require opari2, libunwind-devel, ocl-icd-devel
+- Undefine _ld_as_needed, _hardened_build to make %%check work
+
* 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