sci suitesparse.info, 1.2, 1.3 suitesparse.patch, 1.1, 1.2

David Fang Wed, 14 Sep 2011 10:23:38 -0700

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5184


Modified Files:
        suitesparse.info suitesparse.patch 
Log Message:
sync. w/ 10.!4, validated on powerpc-darwin8


Index: suitesparse.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/suitesparse.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- suitesparse.info    1 Sep 2011 01:49:27 -0000       1.2
+++ suitesparse.info    14 Sep 2011 17:23:30 -0000      1.3
@@ -1,18 +1,23 @@
 Package: suitesparse
-Version: 3.1.0
-Revision: 2
+Version: 3.6.1
+Revision: 1
 Source: 
http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%v.tar.gz
-Source-MD5: 58d90444feef92fc7c265cbd11a757c6
+Source-MD5: 88a44890e8f61cdbb844a76b7259d876 
 SourceDirectory: SuiteSparse
 BuildDepends: fink (>= 0.24.12)
 Conflicts: %n-metis
 Replaces: %n-metis
+BuildConflicts: coreutils-default
+
 PatchFile: %n.patch
-PatchFile-MD5: 1eb2eb73cb1abef598fb7bb51a8a26b3
+PatchFile-MD5: 6afa1a57d31746042d4183207f2de947 
 PatchScript: <<
        %{default_script}
        sed -i.bak -e 's,^CFLAGS = -O,&3 -fstrict-aliasing,' 
C{,X}Sparse/Lib/Makefile
+       sed -i -e 's|-no-cpp-precomp||g' ./UFconfig/UFconfig.mk
 <<
+# avoid race condidtion
+UseMaxBuildJobs: false
 CompileScript: <<
 #! /bin/sh -ev
 # Compile SuiteSparse without METIS.
@@ -59,5 +64,5 @@
 <<
 Description: Suite of Sparse matrix packages
 License: GPL/LGPL
-Maintainer: Ben Abbott <[email protected]>
+Maintainer: Jack Howarth <[email protected]>
 Homepage: http://www.cise.ufl.edu/research/sparse/SuiteSparse/

Index: suitesparse.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/suitesparse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- suitesparse.patch   11 Jul 2011 04:05:48 -0000      1.1
+++ suitesparse.patch   14 Sep 2011 17:23:30 -0000      1.2
@@ -1,28 +1,15 @@
-diff -urN -x .DS_Store originals/SuiteSparse/AMD/Makefile 
SuiteSparse/AMD/Makefile
---- originals/SuiteSparse/AMD/Makefile 2007-05-05 13:23:47.000000000 -0400
-+++ SuiteSparse/AMD/Makefile   2008-03-22 20:19:59.000000000 -0400
-@@ -8,7 +8,7 @@
- 
- # Compile all C code, including the C-callable routines.
- # Do not compile the FORTRAN versions, or MATLAB interface.
--demo:
-+demo: Makefile
-       ( cd Lib    ; $(MAKE) )
-       ( cd Demo   ; $(MAKE) )
- 
-diff -urN -x .DS_Store originals/SuiteSparse/KLU/Include/klu_internal.h 
SuiteSparse/KLU/Include/klu_internal.h
---- originals/SuiteSparse/KLU/Include/klu_internal.h   2007-05-04 
17:00:06.000000000 -0400
-+++ SuiteSparse/KLU/Include/klu_internal.h     2008-03-22 20:19:59.000000000 
-0400
-@@ -9,7 +9,7 @@
+diff -uNr SuiteSparse/KLU/Include/klu_internal.h 
SuiteSparse.patched/KLU/Include/klu_internal.h
+--- SuiteSparse/KLU/Include/klu_internal.h     2009-03-24 14:55:04.000000000 
-0400
++++ SuiteSparse.patched/KLU/Include/klu_internal.h     2011-07-24 
09:50:47.000000000 -0400
+@@ -9,7 +9,6 @@
  
  #include "klu.h" 
  #include "btf.h"
 -#include "klu_version.h"
-+/*#include "klu_version.h"*/
  
  /* ========================================================================== 
*/
  /* make sure debugging and printing is turned off */
-@@ -36,6 +36,8 @@
+@@ -36,6 +35,8 @@
  #include <limits.h>
  #include <stdlib.h>
  #include <math.h>
@@ -31,53 +18,30 @@
  
  #undef ASSERT
  #ifndef NDEBUG
-diff -urN -x .DS_Store originals/SuiteSparse/LDL/Makefile 
SuiteSparse/LDL/Makefile
---- originals/SuiteSparse/LDL/Makefile 2007-05-05 13:24:14.000000000 -0400
-+++ SuiteSparse/LDL/Makefile   2008-03-22 20:19:59.000000000 -0400
-@@ -7,7 +7,7 @@
- include ../UFconfig/UFconfig.mk
- 
- # Compile all C code, including the C-callable routine.
--demo:
-+demo: Makefile
-       ( cd Lib    ; $(MAKE) )
-       ( cd Demo   ; $(MAKE) )
- 
-diff -urN -x .DS_Store originals/SuiteSparse/UFconfig/UFconfig.mk 
SuiteSparse/UFconfig/UFconfig.mk
---- originals/SuiteSparse/UFconfig/UFconfig.mk 2007-10-24 09:55:44.000000000 
-0400
-+++ SuiteSparse/UFconfig/UFconfig.mk   2008-03-22 20:19:59.000000000 -0400
-@@ -32,8 +32,8 @@
- # C compiler and compiler flags:  These will normally not give you optimal
- # performance.  You should select the optimization parameters that are best
- # for your system.  On Linux, use "CFLAGS = -O3 -fexceptions" for example.
--CC = cc
--CFLAGS = -O
-+#CC = cc
-+# CFLAGS = -O
- 
- # ranlib, and ar, for generating libraries
- RANLIB = ranlib
-@@ -49,7 +49,7 @@
+diff -uNr SuiteSparse/UFconfig/UFconfig.mk 
SuiteSparse.patched/UFconfig/UFconfig.mk
+--- SuiteSparse/UFconfig/UFconfig.mk   2011-05-10 16:47:15.000000000 -0400
++++ SuiteSparse.patched/UFconfig/UFconfig.mk   2011-07-24 09:53:37.000000000 
-0400
+@@ -54,7 +54,7 @@
  F77LIB =
  
  # C and Fortran libraries
 -LIB = -lm
 +# LIB = -lm
  
- # For compiling MATLAB mexFunctions (MATLAB 7.5)
+ # For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
  MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
-@@ -85,8 +85,8 @@
- # BLAS = -lgoto -lgfortran -lgfortranbegin
+@@ -91,8 +91,8 @@
+ # naming the BLAS and LAPACK library (*.a or *.so) files.
  
  # This is probably slow ... it might connect to the Standard Reference BLAS:
--BLAS = -lblas -lgfortran -lgfortranbegin
+-BLAS = -lblas -lgfortran
 -LAPACK = -llapack
-+# BLAS = -lblas -lgfortran -lgfortranbegin
++# BLAS = -lblas -lgfortran
 +# LAPACK = -llapack
  
- # The BLAS might not contain xerbla, an error-handling routine for LAPACK and
- # the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
-@@ -114,13 +114,13 @@
+ # NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
+ # statement.  Rather, the Goto BLAS is written by Dr. Kazushige Goto.
+@@ -132,13 +132,13 @@
  # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, 
etc.
  # You may wish to use an absolute path.  METIS is optional.  Compile
  # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
@@ -95,7 +59,7 @@
  
  
#------------------------------------------------------------------------------
  # UMFPACK configuration:
-@@ -176,15 +176,15 @@
+@@ -194,7 +194,7 @@
  # -DNSUNPERF      for Solaris only.  If defined, do not use the Sun
  #                     Performance Library
  
@@ -103,18 +67,17 @@
 +CHOLMOD_CONFIG = -DNPARTITION
  
  
#------------------------------------------------------------------------------
- # Linux
- 
#------------------------------------------------------------------------------
- 
- # Using default compilers:
--# CC = gcc
--CFLAGS = -O3
-+CC = gcc
-+# CFLAGS = -O3
+ # SuiteSparseQR configuration:
+@@ -208,7 +208,7 @@
+ # -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
  
- # alternatives:
- # CFLAGS = -g -fexceptions \
-@@ -252,11 +252,11 @@
+ # default, without timing, without TBB:
+-SPQR_CONFIG =
++SPQR_CONFIG = -DNPARTITION
+ # with timing and TBB:
+ # SPQR_CONFIG = -DTIMING -DHAVE_TBB
+ # with timing
+@@ -328,11 +328,11 @@
  # Macintosh
  
#------------------------------------------------------------------------------
  


------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the 
BlackBerry&reg; mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry&reg; DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1 
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

[cvs] dists/10.4/unstable/main/finkinfo/10.4-EOL/sci suitesparse.info, 1.2, 1.3 suitesparse.patch, 1.1, 1.2

Reply via email to