Ticket #45101: SuiteSparse_4.2.1-4.3.1.svn.diff

File SuiteSparse_4.2.1-4.3.1.svn.diff, 5.7 KB (added by michaelld (Michael Dickens), 10 years ago)

  • Portfile

     
    66
    77name                SuiteSparse
    88epoch               20120107
    9 version             4.2.1
    10 revision            3
     9version             4.3.1
    1110categories          math science
    1211platforms           darwin
    1312maintainers         michaelld openmaintainer
    … …  
    2120long_description    SuiteSparse is a single archive that contains all packages \
    2221                    authored by Tim Davis.
    2322
    24 homepage            http://www.cise.ufl.edu/research/sparse/SuiteSparse/
    25 master_sites        http://www.cise.ufl.edu/research/sparse/SuiteSparse/
     23homepage            http://faculty.cse.tamu.edu/davis/suitesparse.html
     24master_sites        http://faculty.cse.tamu.edu/davis/SuiteSparse/
    2625distname            SuiteSparse-${version}
    2726worksrcdir          ${name}
    2827
    29 checksums           rmd160  9a2fa65845564efad79311f2ff8573217bd79f0d \
    30                     sha256  e8023850bc30742e20a3623fabda02421cb5774b980e3e7c9c6d9e7e864946bd
     28checksums           rmd160  c428095c948655e329f42ecb99a306f371474ed2 \
     29                    sha256  d8718c178e8b87b67c8c9d0740cd01770b9dfdf55668827a8806e79cb40f4359
    3130
    3231# fix Mac configuration file
    3332

  • files/patch-CHOLMOD-Demo-Makefile.diff

     
    11--- CHOLMOD/Demo/Makefile.orig  2013-10-24 12:24:48.000000000 -0400
    22+++ CHOLMOD/Demo/Makefile       2013-10-24 12:31:19.000000000 -0400
    3 @@ -98,10 +98,6 @@
     3@@ -102,10 +102,6 @@
    44        ( cd ../../CCOLAMD ; $(MAKE) library )
    55        ( cd ../../CAMD ; $(MAKE) library )
    66 endif

  • files/patch-SPQR-Demo-Makefile.diff

     
    1 --- SPQR/Demo/Makefile.orig     2013-10-24 12:27:42.000000000 -0400
    2 +++ SPQR/Demo/Makefile  2013-10-24 12:27:57.000000000 -0400
     1--- SPQR/Demo/Makefile.orig     2014-07-14 15:46:58.000000000 -0400
     2+++ SPQR/Demo/Makefile  2014-09-22 14:40:35.000000000 -0400
    33@@ -127,9 +127,6 @@
    44 ../../CAMD/Lib/libcamd.a:
    55        - ( cd ../../CAMD && $(MAKE) library )
    … …  
    77-$(METIS):
    88-       ( cd $(METIS_PATH) && $(MAKE) )
    99-
    10  library: $(CLIB)
    11  
    12  purge: distclean
     10 library:
     11        ( cd ../Lib ; $(MAKE) )
     12        ( cd ../../AMD ; $(MAKE) library )

  • files/patch-SuiteSparce_config_Mac.mk.diff

     
    1 --- SuiteSparse_config/SuiteSparse_config_Mac.mk.orig   2013-10-24 11:47:48.000000000 -0400
    2 +++ SuiteSparse_config/SuiteSparse_config_Mac.mk        2013-10-24 12:04:00.000000000 -0400
    3 @@ -84,8 +84,8 @@
     1--- SuiteSparse_config/SuiteSparse_config_Mac.mk.orig   2014-03-24 23:11:00.000000000 -0400
     2+++ SuiteSparse_config/SuiteSparse_config_Mac.mk        2014-09-22 14:44:38.000000000 -0400
     3@@ -93,8 +93,8 @@
    44 # LIB = -lm
    55 
    66 # For "make install"
    … …  
    1111 
    1212 # Which version of MAKE you are using (default is "make")
    1313 # MAKE = make
    14 @@ -108,8 +108,8 @@
     14@@ -117,8 +117,8 @@
    1515 # naming the BLAS and LAPACK library (*.a or *.so) files.
    1616 
    1717 # This is probably slow ... it might connect to the Standard Reference BLAS:
    18 -BLAS = -lblas -lgfortran
    19 -LAPACK = -llapack
     18-  BLAS = -lblas -lgfortran
     19-  LAPACK = -llapack
    2020+# BLAS = -lblas -lgfortran
    2121+# LAPACK = -llapack
    2222 
    23  # NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
    24  # statement.  Rather, the Goto BLAS is written by Dr. Kazushige Goto.
    25 @@ -164,8 +164,8 @@
     23 # MKL
     24 # BLAS = -Wl,--start-group $(MKLROOT)/lib/intel64/libmkl_intel_lp64.a $(MKLROOT)/lib/intel64/libmkl_core.a $(MKLROOT)/lib/intel64/libmkl_intel_thread.a -Wl,--end-group -lpthread -lm
     25@@ -210,8 +210,8 @@
    2626 # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
    2727 # You may wish to use an absolute path.  METIS is optional.  Compile
    2828 # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
    … …  
    3333 
    3434 #------------------------------------------------------------------------------
    3535 # UMFPACK configuration:
    36 @@ -225,7 +225,7 @@
    37  # -DNSUNPERF       for Solaris only.  If defined, do not use the Sun
    38  #                      Performance Library
     36@@ -271,7 +271,7 @@
     37 # -DNSUNPERF        for Solaris only.  If defined, do not use the Sun
     38 #                   Performance Library
    3939 
    4040-CHOLMOD_CONFIG = $(GPU_CONFIG)
    4141+CHOLMOD_CONFIG = @CHOLMOD_CONFIG@
    … …  
    4242 
    4343 # uncomment this line to compile CHOLMOD without METIS:
    4444 # CHOLMOD_CONFIG = -DNPARTITION
    45 @@ -313,9 +313,9 @@
     45@@ -369,9 +369,9 @@
    4646 # on my MacBook Air, and they work fine.
    4747 
    4848   F77 = gfortran

  • files/patch-UMFPACK-Demo-Makefile.diff

     
    1 --- UMFPACK/Demo/Makefile.orig  2013-10-24 12:27:21.000000000 -0400
    2 +++ UMFPACK/Demo/Makefile       2013-10-24 12:27:25.000000000 -0400
     1--- UMFPACK/Demo/Makefile.orig  2014-03-21 22:19:44.000000000 -0400
     2+++ UMFPACK/Demo/Makefile       2014-09-22 14:37:54.000000000 -0400
    33@@ -80,9 +80,6 @@
    44 ../../CAMD/Lib/libcamd.a:
    55        - ( cd ../../CAMD && $(MAKE) library )
    … …  
    99-
    1010 UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \
    1111     ../../SuiteSparse_config/libsuitesparseconfig.a \
    12      $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
     12     $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)