From 76fa9f3a48ec01f9c5be4689378affbf7a7c6afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 11 Oct 2011 11:42:08 +0200 Subject: [PATCH] fix build without TBB --- suitesparse.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/suitesparse.spec b/suitesparse.spec index ce170e7..eaf2279 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -1,6 +1,6 @@ Name: suitesparse Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: atlas-devel %ifarch %{ix86} x86_64 ia64 BuildRequires: tbb-devel +%global with_tbb 1 %endif Obsoletes: umfpack <= 5.0.1 Obsoletes: ufsparse <= 2.1.1 @@ -306,16 +307,12 @@ popd pushd SPQR pushd Lib -%ifarch %{ix86} x86_64 ia64 - make CFLAGS="$RPM_OPT_FLAGS -DHAVE_TBB -DNPARTITION -fPIC" -%else - make CFLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC" -%endif + make CFLAGS="$RPM_OPT_FLAGS %{?with_tbb:-DHAVE_TBB} -DNPARTITION -fPIC" popd 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 -ltbb -ltbbmalloc \ + -L%{_libdir}/atlas -L%{_libdir} -lcblas -llapack %{?with_tbb:-ltbb -ltbbmalloc} \ libcholmod.so.%{cholmod_version_major} -lm ln -sf libspqr.so.%{spqr_version} libspqr.so.%{spqr_version_major} ln -sf libspqr.so.%{spqr_version} libspqr.so @@ -397,6 +394,9 @@ rm -rf ${RPM_BUILD_ROOT} %doc Doc/* %changelog +* Tue Oct 11 2011 Dan HorĂ¡k - 3.6.1-2 +- fix build without TBB + * Fri Sep 23 2011 Deji Akingunola - 3.6.1-1 - Update to 3.6.1 - Fix undefine symbols in libspqr