- release 4 (by relup.sh)

[packages/SuiteSparse_config.git] / SuiteSparse_config-config.patch

diff --git a/SuiteSparse_config-config.patch b/SuiteSparse_config-config.patch
index be124662680c66c562550d71791aaf69910e8456..1347a5b76f26d8ddcbc3e979a06576ae2f32fb9e 100644 (file)
--- a/SuiteSparse_config-config.patch
+++ b/SuiteSparse_config-config.patch
@@ -1,24 +1,36 @@
---- UFconfig/UFconfig.mk.orig  2007-10-24 15:55:44.000000000 +0200
-+++ UFconfig/UFconfig.mk       2008-01-04 21:27:16.431626182 +0100
-@@ -44,7 +44,7 @@
- MV = mv -f
+--- SuiteSparse_config/SuiteSparse_config.mk.orig      2014-08-16 21:22:58.000000000 +0200
++++ SuiteSparse_config/SuiteSparse_config.mk   2014-10-01 17:06:23.286761684 +0200
+@@ -69,7 +69,7 @@
+ # C and C++ compiler flags.  The first three are standard for *.c and *.cpp
+ # Add -DNTIMER if you do use any timing routines (otherwise -lrt is required).
+ # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
+-  CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC
++CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -fPIC
+ # for the MKL BLAS:
+ # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O3 -fexceptions -fPIC -I$(MKLROOT)/include -D_GNU_SOURCE
  
- # Fortran compiler (not normally required)
--F77 = f77
-+F77 = gfortran
- F77FLAGS = -O
+@@ -84,7 +84,7 @@
+ 
+ # Fortran compiler (not required for 'make' or 'make library')
+ F77 = gfortran
+-F77FLAGS = $(FFLAGS) -O
++F77FLAGS = $(FFLAGS)
  F77LIB =
  
-@@ -85,7 +85,7 @@
- # BLAS = -lgoto -lgfortran -lgfortranbegin
+ # C and Fortran libraries.  Remove -lrt if you don't have it.
+@@ -93,8 +93,9 @@
+ # LIB = -lm
  
- # This is probably slow ... it might connect to the Standard Reference BLAS:
--BLAS = -lblas -lgfortran -lgfortranbegin
-+BLAS = -lblas
- LAPACK = -llapack
+ # For "make install"
+-INSTALL_LIB = /usr/local/lib
+-INSTALL_INCLUDE = /usr/local/include
++INSTALL_PREFIX = /usr
++INSTALL_LIB = $(INSTALL_PREFIX)/lib
++INSTALL_INCLUDE = $(INSTALL_PREFIX)/include
  
- # The BLAS might not contain xerbla, an error-handling routine for LAPACK and
-@@ -114,8 +114,8 @@
+ # Which version of MAKE you are using (default is "make")
+ # MAKE = make
+@@ -210,8 +211,8 @@
  # 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.
@@ -27,5 +39,5 @@
 +METIS_PATH = /usr/include/metis
 +METIS = -lmetis
  
- # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
- # options:
+ #------------------------------------------------------------------------------
+ # UMFPACK configuration: