Rebuild for tbb 2017. tbb is available for all arches now.

This commit is contained in:
Jerry James 2016-09-22 20:18:46 -06:00
parent 498e2f72a9
commit 5324ef5c07

View File

@ -50,7 +50,7 @@
Name: suitesparse
Version: 4.4.6
Release: 5%{?dist}
Release: 6%{?dist}
Summary: A collection of sparse matrix libraries
Group: System Environment/Libraries
@ -63,11 +63,7 @@ BuildRequires: atlas-devel >= 3.10
%else
BuildRequires: atlas-devel
%endif
%ifnarch s390 s390x
BuildRequires: tbb-devel
%global with_tbb 1
%endif
BuildRequires: hardlink
Obsoletes: umfpack <= 5.0.1
@ -131,6 +127,13 @@ This package contains documentation files for %{name}.
%prep
%setup -q -n SuiteSparse
# Fix pragma ivdep so gcc understands it.
for fil in $(grep -Frl 'pragma ivdep' .); do
sed -i.orig 's/pragma ivdep/pragma GCC ivdep/' $fil
touch -r ${fil}.orig $fil
rm -f ${fil}.orig
done
%build
mkdir -p Doc/{AMD,BTF,CAMD,CCOLAMD,CHOLMOD,COLAMD,KLU,LDL,UMFPACK,SPQR,RBio} Lib Include
@ -346,13 +349,13 @@ popd
pushd SPQR
pushd Lib
make CFLAGS="$RPM_OPT_FLAGS %{?with_tbb:-DHAVE_TBB} -DNPARTITION -fPIC"
make CFLAGS="$RPM_OPT_FLAGS -DHAVE_TBB -DNPARTITION -fPIC"
popd
pushd ../Lib
g++ -shared %{?__global_ldflags} -Wl,-soname,libspqr.so.%{spqr_version_major} -o \
libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \
-L%{_libdir}/atlas -L%{_libdir} %{atlaslibs} \
%{?with_tbb:-ltbb} \
-ltbb \
libcholmod.so.%{cholmod_version_major} \
libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm
ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major}
@ -429,6 +432,10 @@ hardlink -cv Docs/ Licenses/
%doc Doc/*
%changelog
* Thu Sep 22 2016 Jerry James <loganjerry@gmail.com> - 4.4.6-6
- Rebuild for tbb 2017
- tbb is available for all arches now
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild