[21844] trunk/dports/math/SuiteSparse
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 9 12:41:26 PST 2007
Revision: 21844
http://trac.macosforge.org/projects/macports/changeset/21844
Author: pipping at macports.org
Date: 2007-02-09 12:41:26 -0800 (Fri, 09 Feb 2007)
Log Message:
-----------
* add patches (now build flawlessly)
* upgrade to 2.4.0
submitted by namely_void at yahoo.co.uk (#11362) - wonderful.
Modified Paths:
--------------
trunk/dports/math/SuiteSparse/Portfile
Added Paths:
-----------
trunk/dports/math/SuiteSparse/files/
trunk/dports/math/SuiteSparse/files/patch-config
trunk/dports/math/SuiteSparse/files/patch-macports-metis
Modified: trunk/dports/math/SuiteSparse/Portfile
===================================================================
--- trunk/dports/math/SuiteSparse/Portfile 2007-02-09 20:40:01 UTC (rev 21843)
+++ trunk/dports/math/SuiteSparse/Portfile 2007-02-09 20:41:26 UTC (rev 21844)
@@ -2,8 +2,7 @@
PortSystem 1.0
name SuiteSparse
-version 2.1.1
-revision 0
+version 2.4.0
categories math science
maintainers andre at splunk.com
platforms darwin
@@ -15,23 +14,20 @@
homepage http://www.cise.ufl.edu/research/sparse/SuiteSparse/
master_sites http://www.cise.ufl.edu/research/sparse/SuiteSparse/
distname SuiteSparse-$version
+worksrcdir ${portname}
depends_build port:metis
-checksums md5 bc01ef2f26e6ad3eed83b4ad62e46a68
+checksums md5 30233f0b42e9ea12e47a287f0f50fe47
+patchfiles patch-config \
+ patch-macports-metis
+
use_configure no
pre-configure {
- reinplace "s,#define SIZE_T_MAX ((size_t) (-1)),," ${worksrcpath}/AMD/Include/amd_internal.h
- reinplace "s,#define SIZE_T_MAX ((size_t) (-1)),," ${worksrcpath}/CAMD/Include/camd_internal.h
reinplace "s,METIS_PATH = ../../metis-4.0,METIS_PATH = ${prefix}/include," ${worksrcpath}/UFconfig/UFconfig.mk
reinplace "s,METIS = ../../metis-4.0/libmetis.a,METIS = ${prefix}/lib/libmetis.a," ${worksrcpath}/UFconfig/UFconfig.mk
- reinplace "s,BLAS = -lgoto -lgfortran,BLAS = -L${prefix}/lib -lblas," ${worksrcpath}/UFconfig/UFconfig.mk
- reinplace "s,-I\$(METIS_PATH)/Lib,-I\$(METIS_PATH)," ${worksrcpath}/CHOLMOD/Lib/Makefile
- reinplace "s,f77,gfortran-dp-4.2," ${worksrcpath}/CXSparse/Demo/Makefile
- reinplace "s,( cd metis-4.0 ; \$(MAKE) ),# ( cd metis-4.0 ; \$(MAKE) )," ${worksrcpath}/Makefile
- reinplace "s,#include \"metis.h\",#include \"metis/metis.h\"," ${worksrcpath}/CHOLMOD/Partition/cholmod_metis.c
}
build.target default
Added: trunk/dports/math/SuiteSparse/files/patch-config
===================================================================
--- trunk/dports/math/SuiteSparse/files/patch-config (rev 0)
+++ trunk/dports/math/SuiteSparse/files/patch-config 2007-02-09 20:41:26 UTC (rev 21844)
@@ -0,0 +1,34 @@
+diff -ru ../SuiteSparse.orig/UFconfig/UFconfig.mk ./UFconfig/UFconfig.mk
+--- ../SuiteSparse.orig/UFconfig/UFconfig.mk 2006-12-12 20:52:47.000000000 +0200
++++ ./UFconfig/UFconfig.mk 2007-02-09 19:16:25.000000000 +0200
+@@ -73,8 +73,8 @@
+ # These settings will probably not work, since there is no fixed convention for
+ # naming the BLAS and LAPACK library (*.a or *.so) files. Assume the Goto
+ # BLAS are available.
+-BLAS = -lgoto -lgfortran -lgfortranbegin
+-LAPACK = -llapack
++BLAS = -framework Accelerate
++LAPACK = -framework Accelerate
+
+ # 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
+@@ -181,7 +181,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:
+@@ -240,8 +240,8 @@
+ # Macintosh
+ #------------------------------------------------------------------------------
+
+-# CC = gcc
+-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
++CC = gcc
++CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions -D_POSIX_C_SOURCE
+ # LIB = -lstdc++
+ # BLAS = -framework Accelerate
+ # LAPACK = -framework Accelerate
Added: trunk/dports/math/SuiteSparse/files/patch-macports-metis
===================================================================
--- trunk/dports/math/SuiteSparse/files/patch-macports-metis (rev 0)
+++ trunk/dports/math/SuiteSparse/files/patch-macports-metis 2007-02-09 20:41:26 UTC (rev 21844)
@@ -0,0 +1,54 @@
+diff -ru ../SuiteSparse.orig/CHOLMOD/Lib/Makefile ./CHOLMOD/Lib/Makefile
+--- ../SuiteSparse.orig/CHOLMOD/Lib/Makefile 2006-10-24 17:09:35.000000000 +0300
++++ ./CHOLMOD/Lib/Makefile 2007-02-09 18:58:15.000000000 +0200
+@@ -116,7 +116,7 @@
+ $(OBJ): $(INC)
+
+ I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD \
+- -I$(METIS_PATH)/Lib -I../../CCOLAMD -I../../CAMD/Include -I../Include \
++ -I$(METIS_PATH) -I../../CCOLAMD -I../../CAMD/Include -I../Include \
+ -I../../UFconfig
+
+
+diff -ru ../SuiteSparse.orig/CHOLMOD/Partition/cholmod_metis.c ./CHOLMOD/Partition/cholmod_metis.c
+--- ../SuiteSparse.orig/CHOLMOD/Partition/cholmod_metis.c 2006-12-13 15:28:28.000000000 +0200
++++ ./CHOLMOD/Partition/cholmod_metis.c 2007-02-09 18:59:54.000000000 +0200
+@@ -49,7 +49,7 @@
+ #include "cholmod_internal.h"
+ #undef ASSERT
+
+-#include "metis.h"
++#include <metis/metis.h>
+ /* METIS has its own ASSERT that it reveals to the user, so remove it here: */
+ #undef ASSERT
+
+diff -ru ../SuiteSparse.orig/Makefile ./Makefile
+--- ../SuiteSparse.orig/Makefile 2006-12-02 00:31:29.000000000 +0200
++++ ./Makefile 2007-02-09 19:00:17.000000000 +0200
+@@ -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) )
+@@ -42,7 +42,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 )
+@@ -62,7 +62,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 )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070209/cdf58466/attachment.html
More information about the macports-changes
mailing list