Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32557
Modified Files:
octave.info suitesparse.info suitesparse.patch
Log Message:
UPdate from tracker
http://sourceforge.net/tracker/index.php?func=detail&aid=1923649&group_id=17203&atid=414256
plus corresponding update to octave
Index: suitesparse.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/suitesparse.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- suitesparse.info 20 Nov 2007 00:39:32 -0000 1.1
+++ suitesparse.info 8 Apr 2008 17:31:24 -0000 1.2
@@ -1,8 +1,8 @@
Package: suitesparse
-Version: 3.0.0
+Version: 3.1.0
Revision: 1
Source:
http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%v.tar.gz
-Source-MD5: 4eecd769cf236be413699b2984c39f97
+Source-MD5: 58d90444feef92fc7c265cbd11a757c6
SourceDirectory: SuiteSparse
Patch: %n.patch
PatchScript: sed -i.bak -e 's,^CFLAGS = -O,&3 -fstrict-aliasing,'
C{,X}Sparse/Lib/Makefile
Index: suitesparse.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/suitesparse.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- suitesparse.patch 24 Nov 2007 00:15:34 -0000 1.2
+++ suitesparse.patch 8 Apr 2008 17:31:25 -0000 1.3
@@ -1,111 +1,80 @@
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 2007-10-17 11:48:07.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
++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 2007-11-03 08:09:44.000000000
-0400
++++ SuiteSparse/KLU/Include/klu_internal.h 2008-03-22 20:19:59.000000000
-0400
@@ -9,7 +9,7 @@
-
- #include "klu.h"
+
+ #include "klu.h"
#include "btf.h"
-#include "klu_version.h"
-+/* #include "klu_version.h" */
-
++/*#include "klu_version.h"*/
+
/* ==========================================================================
*/
/* make sure debugging and printing is turned off */
-@@ -36,6 +36,9 @@
+@@ -36,6 +36,8 @@
#include <limits.h>
#include <stdlib.h>
#include <math.h>
+/* moved klu_version.h after math.h to circumvent compile error on ppc */
-+/* (duplicate element name "component") ... each define Real and Imag */
+#include "klu_version.h"
-
+
#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 2007-10-17 12:00:03.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
++demo: Makefile
( cd Lib ; $(MAKE) )
( cd Demo ; $(MAKE) )
-
-diff -urN -x .DS_Store originals/SuiteSparse/Makefile SuiteSparse/Makefile
---- originals/SuiteSparse/Makefile 2007-05-07 18:28:44.000000000 -0400
-+++ SuiteSparse/Makefile 2007-10-17 10:38:28.000000000 -0400
-@@ -7,7 +7,7 @@
- # Compile the default rules for each package
- default:
- ( cd UFconfig/xerbla ; $(MAKE) )
-- ( cd metis-4.0 ; $(MAKE) )
-+# ( cd metis-4.0 ; $(MAKE) )
- ( cd AMD ; $(MAKE) )
- ( cd CAMD ; $(MAKE) )
- ( cd COLAMD ; $(MAKE) )
-@@ -41,7 +41,7 @@
- # Remove all files not in the original distribution
- purge:
- ( cd UFconfig/xerbla ; $(MAKE) purge )
-- ( cd metis-4.0 ; $(MAKE) realclean )
-+# ( cd metis-4.0 ; $(MAKE) realclean )
- ( cd AMD ; $(MAKE) purge )
- ( cd CAMD ; $(MAKE) purge )
- ( cd COLAMD ; $(MAKE) purge )
-@@ -61,7 +61,7 @@
- # Remove all files not in the original distribution, but keep the libraries
- clean:
- ( cd UFconfig/xerbla ; $(MAKE) clean )
-- ( cd metis-4.0 ; $(MAKE) clean )
-+# ( cd metis-4.0 ; $(MAKE) clean )
- ( cd AMD ; $(MAKE) clean )
- ( cd CAMD ; $(MAKE) clean )
- ( cd COLAMD ; $(MAKE) clean )
+
diff -urN -x .DS_Store originals/SuiteSparse/UFconfig/UFconfig.mk
SuiteSparse/UFconfig/UFconfig.mk
---- originals/SuiteSparse/UFconfig/UFconfig.mk 2007-05-10 09:46:08.000000000
-0400
-+++ SuiteSparse/UFconfig/UFconfig.mk 2007-11-02 07:28:40.000000000 -0400
+--- 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
++#CC = cc
+# CFLAGS = -O
-
+
# ranlib, and ar, for generating libraries
RANLIB = ranlib
@@ -49,7 +49,7 @@
F77LIB =
-
+
# C and Fortran libraries
-LIB = -lm
+# LIB = -lm
-
- # For compiling MATLAB mexFunctions (MATLAB 7.4 or later)
- MEX = mex -O -largeArrayDims -lmwlapack
+
+ # For compiling MATLAB mexFunctions (MATLAB 7.5)
+ MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
@@ -85,8 +85,8 @@
# BLAS = -lgoto -lgfortran -lgfortranbegin
-
+
# This is probably slow ... it might connect to the Standard Reference BLAS:
-BLAS = -lblas -lgfortran -lgfortranbegin
-LAPACK = -llapack
+# BLAS = -lblas -lgfortran -lgfortranbegin
+# 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 @@
@@ -116,48 +85,49 @@
-METIS = ../../metis-4.0/libmetis.a
+# METIS_PATH = ../../metis-4.0
+# METIS = ../../metis-4.0/libmetis.a
-
+
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
-# METIS_PATH =
-# METIS =
+METIS_PATH =
+METIS =
-
+
#------------------------------------------------------------------------------
# UMFPACK configuration:
-@@ -176,7 +176,7 @@
+@@ -176,15 +176,15 @@
# -DNSUNPERF for Solaris only. If defined, do not use the Sun
# Performance Library
-
+
-CHOLMOD_CONFIG =
+CHOLMOD_CONFIG = -DNPARTITION
-
+
#------------------------------------------------------------------------------
# Linux
-@@ -193,7 +193,7 @@
- # CFLAGS = -O3 -fexceptions \
- -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
--CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-+# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
- # CFLAGS = -O3
-
- # consider:
+
#------------------------------------------------------------------------------
+
+ # Using default compilers:
+-# CC = gcc
+-CFLAGS = -O3
++CC = gcc
++# CFLAGS = -O3
+
+ # alternatives:
+ # CFLAGS = -g -fexceptions \
@@ -252,11 +252,11 @@
# Macintosh
#------------------------------------------------------------------------------
-
+
-# CC = gcc
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# LIB = -lstdc++
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
+CC = gcc
-+CFLAGS = -O3 -fno-common -fstrict-aliasing -fexceptions
++CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
+LIB = -lstdc++
+BLAS = -framework Accelerate
+LAPACK = -framework Accelerate
-
+
#------------------------------------------------------------------------------
# IBM RS 6000
Index: octave.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave.info,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- octave.info 27 Mar 2008 18:31:25 -0000 1.36
+++ octave.info 8 Apr 2008 17:31:24 -0000 1.37
@@ -2,13 +2,13 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean)
Version: 3.0.0
-Revision: 3
+Revision: 4
Distribution: 10.4, 10.5
Maintainer: Alexander Hansen <[EMAIL PROTECTED]>
BuildDependsOnly: false
Source: ftp://ftp.octave.org/pub/octave/octave-%v.tar.bz2
Source-MD5: d5512acdf60ac04398ff258cbc37f3c4
-BuildDepends: glpk-dev, hdf5 (>= 1.6.5-1012), readline5, texinfo, libncurses5,
fftw3 (>= 3.1.1-7), texi2html, tetex-base, libcurl4, sed, pcre, gcc43,
suitesparse, qhull, fink (>= 0.28)
+BuildDepends: glpk-dev, hdf5 (>= 1.6.5-1012), readline5, texinfo, libncurses5,
fftw3 (>= 3.1.1-7), texi2html, tetex-base, libcurl4, sed, pcre, gcc43,
suitesparse ( = 3.1.0-1 ), qhull, fink (>= 0.28)
Depends: glpk-shlibs, gnuplot | gnuplot-nox, readline5-shlibs, fftw3-shlibs
(>= 3.1.1-7), hdf5-shlibs (>= 1.6.5-1012), ncurses, libncurses5-shlibs,
aquaterm, libcurl4-shlibs, pcre-shlibs, gcc43-shlibs, (%type_raw[-atlas] =
-atlas) atlas-shlibs (>= 3.8.1-1)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77
GCC: 4.0
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
