- added includes patch (fixes inclusion of AMD/BTF/COLAMD headers); release 2

[packages/KLU.git] / KLU-shared.patch

diff --git a/KLU-shared.patch b/KLU-shared.patch
index 7b85b757c240e5e5b7c7bf758ee07c05ccaeb5c0..33dff1757756f3ac693c0f10bac4a3a47ff5a73a 100644 (file)
--- a/KLU-shared.patch
+++ b/KLU-shared.patch
@@ -277,14 +277,14 @@
 +      libtool --tag=CC --mode=compile $(C) -c -DDLONG $(I) $< -o $@
  
  #-------------------------------------------------------------------------------
---- KLU/Demo/Makefile.orig     2012-01-29 18:59:19.771183432 +0100
-+++ KLU/Demo/Makefile  2012-01-29 21:26:17.944812032 +0100
+--- KLU/Demo/Makefile.orig     2014-10-03 16:36:48.796251087 +0200
++++ KLU/Demo/Makefile  2014-10-03 16:39:42.522910463 +0200
 @@ -5,7 +5,7 @@
  
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
  
--LIB = ../Lib/libklu.a -lbtf -lamd -lcolamd
-+LIB = ../Lib/libklu.la -lbtf -lamd -lcolamd
+-CLIB = ../Lib/libklu.a -lbtf -lamd -lcolamd -lsuitesparseconfig
++CLIB = ../Lib/libklu.la -lbtf -lamd -lcolamd -lsuitesparseconfig
  
  CHOLMOD = -lcholmod
  
@@ -300,15 +300,15 @@
 @@ -40,11 +40,11 @@
        - $(RM) $(CLEAN)
  
- kludemo: kludemo.c Makefile $(LIB)
--      $(CC) $(CF) $(I) kludemo.c -o kludemo $(LIB) $(CHOLMOD) -lm
-+      libtool --tag=CC --mode=link $(CC) $(CF) $(I) kludemo.c -o kludemo $(LIB) $(CHOLMOD) -lm
+ kludemo: kludemo.c Makefile $(CLIB)
+-      $(CC) $(CF) $(I) kludemo.c -o kludemo $(CLIB) $(CHOLMOD) $(LIB)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) kludemo.c -o kludemo $(CLIB) $(CHOLMOD) $(LIB)
  
- kluldemo: kludemo.c Makefile $(LIB)
--      $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(LIB) $(CHOLMOD) -lm
-+      libtool --tag=CC --mode=link $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(LIB) $(CHOLMOD) -lm
+ kluldemo: kludemo.c Makefile $(CLIB)
+-      $(CC) $(CF) $(I) kluldemo.c -o kluldemo $(CLIB) $(CHOLMOD) $(LIB)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) kluldemo.c -o kluldemo $(CLIB) $(CHOLMOD) $(LIB)
  
- klu_simple: klu_simple.c Makefile $(LIB)
--      $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(LIB) -lm
-+      libtool --tag=CC --mode=link $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(LIB) -lm
+ klu_simple: klu_simple.c Makefile $(CLIB)
+-      $(CC) $(CF) $(I) klu_simple.c -o klu_simple $(CLIB) $(LIB)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CF) $(I) klu_simple.c -o klu_simple $(CLIB) $(LIB)
        - ./klu_simple