From 248cc40cfa2751e83df68f32704e25dbac1fd5d0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 20 Sep 2013 17:54:15 +0200 Subject: [PATCH] build against atlas 3.10.x --- suitesparse.spec | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/suitesparse.spec b/suitesparse.spec index 3e22760..020fee8 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,6 +1,18 @@ +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 +%bcond_without atlas310 +%else +%bcond_with atlas310 +%endif + +%if %{with atlas310} +%global cblaslib satlas +%else +%global cblaslib cblas +%endif + Name: suitesparse Version: 4.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -9,7 +21,11 @@ URL: http://www.cise.ufl.edu/research/sparse/SuiteSparse Source0: http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if %{with atlas310} +BuildRequires: atlas-devel >= 3.10 +%else BuildRequires: atlas-devel +%endif %ifarch %{ix86} x86_64 ia64 BuildRequires: tbb-devel %global with_tbb 1 @@ -217,7 +233,8 @@ pushd CHOLMOD pushd ../Lib gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o \ libcholmod.so.%{cholmod_version} ../CHOLMOD/Lib/*.o \ - -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} \ + -L%{_libdir}/atlas -l%{cblaslib} -llapack \ + libamd.so.%{amd_version_major} \ libcamd.so.%{camd_version_major} libcolamd.so.%{colamd_version_major} \ libccolamd.so.%{ccolamd_version_major} \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm @@ -309,7 +326,8 @@ pushd UMFPACK pushd ../Lib gcc -shared -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \ libumfpack.so.%{umfpack_version} ../UMFPACK/Lib/*.o \ - -L%{_libdir}/atlas -lcblas -llapack libamd.so.%{amd_version_major} \ + -L%{_libdir}/atlas -l%{cblaslib} -llapack \ + libamd.so.%{amd_version_major} \ libcholmod.so.%{cholmod_version_major} \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm ln -sf libumfpack.so.%{umfpack_version} libumfpack.so.%{umfpack_version_major} @@ -327,7 +345,8 @@ pushd SPQR pushd ../Lib g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \ - -L%{_libdir}/atlas -L%{_libdir} -lcblas -llapack %{?with_tbb:-ltbb -ltbbmalloc} \ + -L%{_libdir}/atlas -L%{_libdir} -l%{cblaslib} -llapack \ + %{?with_tbb:-ltbb -ltbbmalloc} \ libcholmod.so.%{cholmod_version_major} \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major} @@ -397,6 +416,9 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Fri Sep 20 2013 Nils Philippsen - 4.0.2-7 +- build against atlas 3.10.x + * Tue Sep 03 2013 Nils Philippsen - 4.0.2-6 - include C++ headers (#1001943) - fix bogus dates in changelog