rpms/suitesparse/devel suitesparse.spec, 1.13, 1.14 suitesparse_build.patch, 1.2, 1.3

Deji Akingunola deji at fedoraproject.org
Sun May 10 23:51:38 UTC 2009


Author: deji

Update of /cvs/pkgs/rpms/suitesparse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25276

Modified Files:
	suitesparse.spec suitesparse_build.patch 
Log Message:
Only buildrequires (and build SQPR with) tbb on x86* and ia64 archs



Index: suitesparse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/devel/suitesparse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- suitesparse.spec	10 May 2009 23:06:46 -0000	1.13
+++ suitesparse.spec	10 May 2009 23:51:07 -0000	1.14
@@ -10,7 +10,10 @@ Source0:        http://www.cise.ufl.edu/
 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 \

suitesparse_build.patch:

Index: suitesparse_build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/suitesparse/devel/suitesparse_build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- suitesparse_build.patch	10 May 2009 23:06:46 -0000	1.2
+++ suitesparse_build.patch	10 May 2009 23:51:07 -0000	1.3
@@ -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




More information about the scm-commits mailing list