Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv17971
Added Files:
suitesparse-metis.info suitesparse-metis.patch
Log Message:
sync with 10.!4, validated on powerpc-darwin8
--- NEW FILE: suitesparse-metis.patch ---
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 @@
#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 @@
#include <limits.h>
#include <stdlib.h>
#include <math.h>
+/* moved klu_version.h after math.h to circumvent compile error on ppc */
+#include "klu_version.h"
#undef ASSERT
#ifndef NDEBUG
diff -Nurd 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-08-24 15:14:47.000000000
-0400
@@ -33,8 +33,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 = -O3 -fexceptions
+#CC = cc
+#CFLAGS = -O3 -fexceptions
# C++ compiler (also uses CFLAGS)
CPLUSPLUS = g++
@@ -54,7 +54,7 @@
F77LIB =
# C and Fortran libraries
-LIB = -lm
+#LIB = -lm
# For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
@@ -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
-LAPACK = -llapack
+#BLAS = -lblas -lgfortran
+#LAPACK = -llapack
# 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.
-METIS_PATH = ../../metis-4.0
-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 = @METISPREFIX@
+METIS = @METISPREFIX@/lib/libmetis.a
#------------------------------------------------------------------------------
# UMFPACK configuration:
@@ -194,7 +194,7 @@
# -DNSUNPERF for Solaris only. If defined, do not use the Sun
# Performance Library
-CHOLMOD_CONFIG =
+CHOLMOD_CONFIG =
#------------------------------------------------------------------------------
# SuiteSparseQR configuration:
@@ -232,7 +232,7 @@
#------------------------------------------------------------------------------
# Using default compilers:
-# CC = gcc
+CC = gcc
# CFLAGS = -O3 -fexceptions
# alternatives:
@@ -286,10 +286,10 @@
# As recommended by macports, http://suitesparse.darwinports.com/
# I've tested them myself on Mac OSX 10.6.1 (Snow Leopard), on my MacBook Air.
-# F77 = gfortran
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
+F77 = gfortran
+CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
+BLAS = -framework Accelerate
+LAPACK = -framework Accelerate
# Using netlib.org LAPACK and BLAS compiled by gfortran, with and without
# optimzation:
--- NEW FILE: suitesparse-metis.info ---
Package: suitesparse-metis
Version: 3.6.1
Revision: 1
Source:
http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%v.tar.gz
Source-MD5: 88a44890e8f61cdbb844a76b7259d876
SourceDirectory: SuiteSparse
BuildDepends: fink (>= 0.24.12)
BuildConflicts: coreutils-default
Conflicts: suitesparse
Replaces: suitesparse
Depends: metis
PatchFile: %n.patch
PatchFile-MD5: 86e123887db5bcc19880b49fe4ffe2e6
PatchScript: <<
#!/bin/sh -ev
sed -e 's,@METISPREFIX@,%p,g' %{PatchFile} | patch -p1
sed -i.bak -e 's,^CFLAGS = -O,&3 -fstrict-aliasing,'
C{,X}Sparse/Lib/Makefile
sed -i -e 's,I$(METIS_PATH)/Lib,I$(METIS_PATH)/include,'
CHOLMOD/Lib/Makefile
sed -i -e 's|-no-cpp-precomp||g' ./UFconfig/UFconfig.mk
<<
# avoid race condidtion
UseMaxBuildJobs: false
CompileScript: <<
#! /bin/sh -ev
# Compile SuiteSparse with METIS.
export CHOLMOD_CONFIG=''
echo **** Start: Message from SuiteSparse CompileScript ****
echo CHOLMOD_CONFIG = $CHOLMOD_CONFIG
echo **** Stop: Message from SuiteSparse CompileScript ****
make default
<<
InstallScript: <<
#! /bin/sh -ev
install -d %i/lib
find . -name 'lib*.a' -exec install -m 644 \{\} %i/lib \;
rm %i/lib/libcsparse.a
ranlib %i/lib/lib*.a
install -d %i/include/suitesparse
install -p -m 644 \
`find . -name '*.h'|egrep -v
'^\./(CSparse/|CXSparse_n|UMFPACK/Source/)|/(MATLAB|Demo|Tcov)/|_(internal|version)\.h$'`
\
%i/include/suitesparse
for f in `ls -1 {,*/,CHOLMOD/*/}*.txt|egrep -v '_newfiles|MATLAB'|sed -e
's,^,./,' -e 's,/[^/]*$,,'|sort -u`
do install -d %i/share/doc/suitesparse/$f; install -p -m 644 $f/*.txt
%i/share/doc/suitesparse/$f; done
for f in `ls -1d */Doc|fgrep -v _newfiles|sed -e 's,/[^/]*$,,'`
do install -d %i/share/doc/suitesparse/$f; install -p -m 644 $f/Doc/*
%i/share/doc/suitesparse/$f; done
cd %i/share/doc/suitesparse
# replace duplicates by symlinks
for n in lesser gpl; do
l=`ls -1 {,*/}*/$n.txt`
target=`tail -n1<<<"$l"`
list=`sed -e '$d'<<<"$l"`
for f in $list; do g=`sed -e 's,[^/]\+,..,g' -e 's,\.\.$,,' <<<"$f"`;
ln -fs $g$target $f; done
done
# clean up
find . \( -name Makefile \
-o -name '*.bib' -o -name '*.tex' -o -name '*.stex' -o -name '*.sed*'
-o -name '*.awk' -o -name '*diff' -o -name '*proto' \
\) -exec rm \{\} \;
cd -
<<
Description: Suite of Sparse matrix packages
DescUsage: <<
This version of SuiteSparse uses the METIS libraries. Packages that link
against libcholmod.a from this one will also need to use -lmetis.
<<
License: GPL/LGPL
Maintainer: Alexander Hansen <[email protected]>
Homepage: http://www.cise.ufl.edu/research/sparse/SuiteSparse/
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
