Mercurial > mxe-octave
changeset 2496:aaa92d250d5c
Merge pull request #33 from tonytheodore/fix-suitesparse
package suitesparse: fix compiling 3.7.0
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Thu, 03 May 2012 02:58:07 -0700 |
| parents | d3034915cd6b (current diff) 10ed3017dcb8 (diff) |
| children | 3dfd08abb308 |
| files | |
| diffstat | 2 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/suitesparse-1.patch Thu May 03 02:58:07 2012 -0700 @@ -0,0 +1,19 @@ +--- SuiteSparse-3.7.0/CHOLMOD/Makefile 2011-12-08 19:56:52.000000000 +0100 ++++ SuiteSparse-3.6.0/CHOLMOD/Makefile 2011-01-25 21:05:49.000000000 +0100 +@@ -13,6 +13,6 @@ + + # Compile the C-callable libraries and the Demo programs. + all: ++ ( cd Lib ; $(MAKE) ) +- ( cd Demo ; $(MAKE) ) + + # Compile the C-callable libraries only. +--- SuiteSparse-3.7.0/UMFPACK/Makefile 2011-12-08 20:57:27.000000000 +0100 ++++ SuiteSparse-3.6.1/UMFPACK/Makefile 2011-01-25 21:07:50.000000000 +0100 +@@ -13,5 +13,5 @@ + # compile all C code (except hb, fortran, and fortran64), including AMD and the + # demos, but not the MATLAB mexFunctions + all: ++ ( cd Lib ; $(MAKE) ) +- ( cd Demo ; $(MAKE) ) +
--- a/src/suitesparse.mk Thu May 03 08:02:36 2012 +1000 +++ b/src/suitesparse.mk Thu May 03 02:58:07 2012 -0700 @@ -24,7 +24,7 @@ CC='$(TARGET)-gcc' \ CPLUSPLUS='$(TARGET)-g++' \ F77='$(TARGET)-gfortran' \ - AR='$(TARGET)-ar cr' \ + AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' \ BLAS='-lblas -lgfortran -lgfortranbegin' \ CHOLMOD_CONFIG='-DNPARTITION'