From 02b7af486cdd5d3d4177599a4711d5cede7aacb0 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Sun, 10 May 2009 23:51:07 +0000 Subject: [PATCH] Only buildrequires (and build SQPR with) tbb on x86* and ia64 archs --- suitesparse.spec | 9 ++++++++- suitesparse_build.patch | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/suitesparse.spec b/suitesparse.spec index b281674..5af4720 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -10,7 +10,10 @@ Source0: http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse- Patch0: suitesparse_build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: atlas-devel tbb-devel +BuildRequires: atlas-devel +%ifarch %{ix86} x86_64 ia64 +BuildRequires: tbb-devel +%endif Obsoletes: umfpack <= 5.0.1 Obsoletes: ufsparse <= 2.1.1 Provides: ufsparse = %{version}-%{release} @@ -295,7 +298,11 @@ 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 popd pushd ../Lib g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ diff --git a/suitesparse_build.patch b/suitesparse_build.patch index 09efa3f..069ba22 100644 --- a/suitesparse_build.patch +++ b/suitesparse_build.patch @@ -52,7 +52,7 @@ # default, without timing, without TBB: -SPQR_CONFIG = -+SPQR_CONFIG = -DHAVE_TBB -DNPARTITION ++SPQR_CONFIG = -DNPARTITION # with timing and TBB: # SPQR_CONFIG = -DTIMING -DHAVE_TBB # with timing