Ticket #11362: SuiteSparse-Portfile-240.patch

File SuiteSparse-Portfile-240.patch, 6.0 KB (added by namely_void@…, 17 years ago)

Patch relative to current SuiteSparse Portfile

  • Portfile

    diff -Nru /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/math/SuiteSparse/Portfile ./Portfile
    old new  
    22
    33PortSystem 1.0
    44name            SuiteSparse
    5 version         2.1.1
    6 revision        0
     5version         2.4.0
    76categories      math science
    87maintainers     andre@splunk.com
    98platforms       darwin
     
    1514homepage        http://www.cise.ufl.edu/research/sparse/SuiteSparse/
    1615master_sites    http://www.cise.ufl.edu/research/sparse/SuiteSparse/
    1716distname        SuiteSparse-$version
     17worksrcdir      ${portname}
    1818
    1919depends_build   port:metis
    2020
    21 checksums       md5 bc01ef2f26e6ad3eed83b4ad62e46a68
     21checksums       md5 30233f0b42e9ea12e47a287f0f50fe47
     22
     23patchfiles      patch-config \
     24                patch-macports-metis
    2225
    2326use_configure   no
    2427
    2528pre-configure   {
    26                 reinplace "s,#define SIZE_T_MAX ((size_t) (-1)),," ${worksrcpath}/AMD/Include/amd_internal.h
    27                 reinplace "s,#define SIZE_T_MAX ((size_t) (-1)),," ${worksrcpath}/CAMD/Include/camd_internal.h
    2829                reinplace "s,METIS_PATH = ../../metis-4.0,METIS_PATH = ${prefix}/include," ${worksrcpath}/UFconfig/UFconfig.mk
    2930                reinplace "s,METIS = ../../metis-4.0/libmetis.a,METIS = ${prefix}/lib/libmetis.a," ${worksrcpath}/UFconfig/UFconfig.mk
    30                 reinplace "s,BLAS = -lgoto -lgfortran,BLAS = -L${prefix}/lib -lblas," ${worksrcpath}/UFconfig/UFconfig.mk
    31                 reinplace "s,-I\$(METIS_PATH)/Lib,-I\$(METIS_PATH)," ${worksrcpath}/CHOLMOD/Lib/Makefile
    32                 reinplace "s,f77,gfortran-dp-4.2," ${worksrcpath}/CXSparse/Demo/Makefile
    33                 reinplace "s,( cd metis-4.0 ; \$(MAKE) ),# ( cd metis-4.0 ; \$(MAKE) )," ${worksrcpath}/Makefile
    34                 reinplace "s,#include \"metis.h\",#include \"metis/metis.h\"," ${worksrcpath}/CHOLMOD/Partition/cholmod_metis.c
    3531}
    3632
    3733build.target    default
  • files/patch-config

    diff -Nru /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/math/SuiteSparse/files/patch-config ./files/patch-config
    old new  
     1diff -ru ../SuiteSparse.orig/UFconfig/UFconfig.mk ./UFconfig/UFconfig.mk
     2--- ../SuiteSparse.orig/UFconfig/UFconfig.mk    2006-12-12 20:52:47.000000000 +0200
     3+++ ./UFconfig/UFconfig.mk      2007-02-09 19:16:25.000000000 +0200
     4@@ -73,8 +73,8 @@
     5 # These settings will probably not work, since there is no fixed convention for
     6 # naming the BLAS and LAPACK library (*.a or *.so) files.  Assume the Goto
     7 # BLAS are available.
     8-BLAS = -lgoto -lgfortran -lgfortranbegin
     9-LAPACK = -llapack
     10+BLAS = -framework Accelerate
     11+LAPACK = -framework Accelerate
     12 
     13 # The BLAS might not contain xerbla, an error-handling routine for LAPACK and
     14 # the BLAS.  Also, the standard xerbla requires the Fortran I/O library, and
     15@@ -181,7 +181,7 @@
     16 # CFLAGS = -O3 -fexceptions \
     17        -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \
     18        -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi
     19-CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
     20+# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
     21 # CFLAGS = -O3
     22 
     23 # consider:
     24@@ -240,8 +240,8 @@
     25 # Macintosh
     26 #------------------------------------------------------------------------------
     27 
     28-# CC = gcc
     29-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
     30+CC = gcc
     31+CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions -D_POSIX_C_SOURCE
     32 # LIB = -lstdc++
     33 # BLAS = -framework Accelerate
     34 # LAPACK = -framework Accelerate
  • files/patch-macports-metis

    diff -Nru /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports/math/SuiteSparse/files/patch-macports-metis ./files/patch-macports-metis
    old new  
     1diff -ru ../SuiteSparse.orig/CHOLMOD/Lib/Makefile ./CHOLMOD/Lib/Makefile
     2--- ../SuiteSparse.orig/CHOLMOD/Lib/Makefile    2006-10-24 17:09:35.000000000 +0300
     3+++ ./CHOLMOD/Lib/Makefile      2007-02-09 18:58:15.000000000 +0200
     4@@ -116,7 +116,7 @@
     5 $(OBJ): $(INC)
     6 
     7 I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD \
     8-       -I$(METIS_PATH)/Lib -I../../CCOLAMD -I../../CAMD/Include -I../Include \
     9+       -I$(METIS_PATH) -I../../CCOLAMD -I../../CAMD/Include -I../Include \
     10        -I../../UFconfig
     11 
     12 
     13diff -ru ../SuiteSparse.orig/CHOLMOD/Partition/cholmod_metis.c ./CHOLMOD/Partition/cholmod_metis.c
     14--- ../SuiteSparse.orig/CHOLMOD/Partition/cholmod_metis.c       2006-12-13 15:28:28.000000000 +0200
     15+++ ./CHOLMOD/Partition/cholmod_metis.c 2007-02-09 18:59:54.000000000 +0200
     16@@ -49,7 +49,7 @@
     17 #include "cholmod_internal.h"
     18 #undef ASSERT
     19 
     20-#include "metis.h"
     21+#include <metis/metis.h>
     22 /* METIS has its own ASSERT that it reveals to the user, so remove it here: */
     23 #undef ASSERT
     24 
     25diff -ru ../SuiteSparse.orig/Makefile ./Makefile
     26--- ../SuiteSparse.orig/Makefile        2006-12-02 00:31:29.000000000 +0200
     27+++ ./Makefile  2007-02-09 19:00:17.000000000 +0200
     28@@ -7,7 +7,7 @@
     29 # Compile the default rules for each package
     30 default:
     31        ( cd UFconfig/xerbla ; $(MAKE) )
     32-       ( cd metis-4.0 ; $(MAKE) )
     33+#      ( cd metis-4.0 ; $(MAKE) )
     34        ( cd AMD ; $(MAKE) )
     35        ( cd CAMD ; $(MAKE) )
     36        ( cd COLAMD ; $(MAKE) )
     37@@ -42,7 +42,7 @@
     38 # Remove all files not in the original distribution
     39 purge:
     40        ( cd UFconfig/xerbla ; $(MAKE) purge )
     41-       ( cd metis-4.0 ; $(MAKE) realclean )
     42+#      ( cd metis-4.0 ; $(MAKE) realclean )
     43        ( cd AMD ; $(MAKE) purge )
     44        ( cd CAMD ; $(MAKE) purge )
     45        ( cd COLAMD ; $(MAKE) purge )
     46@@ -62,7 +62,7 @@
     47 # Remove all files not in the original distribution, but keep the libraries
     48 clean:
     49        ( cd UFconfig/xerbla ; $(MAKE) clean )
     50-       ( cd metis-4.0 ; $(MAKE) clean )
     51+#      ( cd metis-4.0 ; $(MAKE) clean )
     52        ( cd AMD ; $(MAKE) clean )
     53        ( cd CAMD ; $(MAKE) clean )
     54        ( cd COLAMD ; $(MAKE) clean )