- fix SuiteSparse_config BR

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

diff --git a/CAMD-shared.patch b/CAMD-shared.patch
index 48e4bb01f751f1fbc358f33655a9211888df9d82..065e086ebede57b466b945b905e4919db4f88150 100644 (file)
--- a/CAMD-shared.patch
+++ b/CAMD-shared.patch
@@ -1,36 +1,34 @@
-diff -ur camd/Demo/Makefile camd-shared/Demo/Makefile
---- camd/Demo/Makefile 2007-12-02 19:00:33.000000000 +0100
-+++ camd-shared/Demo/Makefile  2007-12-02 18:55:08.000000000 +0100
-@@ -23,22 +23,22 @@
+--- CAMD/Demo/Makefile.orig    2014-10-01 20:15:40.452951732 +0200
++++ CAMD/Demo/Makefile 2014-10-01 20:40:07.992890145 +0200
+@@ -22,22 +22,22 @@
  dist:
  
  camd_demo: camd_demo.c library $(INC)
--      $(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo camd_demo.c ../Lib/libcamd.la $(LIB)
+-      $(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo camd_demo.c ../Lib/libcamd.la $(LIB2)
        ./camd_demo > my_camd_demo.out
        - diff camd_demo.out my_camd_demo.out
  
  camd_l_demo: camd_l_demo.c library $(INC)
--      $(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_l_demo camd_l_demo.c ../Lib/libcamd.la $(LIB)
+-      $(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_l_demo camd_l_demo.c ../Lib/libcamd.la $(LIB2)
        ./camd_l_demo > my_camd_l_demo.out
        - diff camd_l_demo.out my_camd_l_demo.out
  
  camd_demo2: camd_demo2.c library $(INC)
--      $(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo2 camd_demo2.c ../Lib/libcamd.la $(LIB)
+-      $(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_demo2 camd_demo2.c ../Lib/libcamd.la $(LIB2)
        ./camd_demo2 > my_camd_demo2.out
        - diff camd_demo2.out my_camd_demo2.out
  
  camd_simple: camd_simple.c library $(INC)
--      $(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_simple camd_simple.c ../Lib/libcamd.la $(LIB)
+-      $(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o camd_simple camd_simple.c ../Lib/libcamd.la $(LIB2)
        ./camd_simple > my_camd_simple.out
        - diff camd_simple.out my_camd_simple.out
  
-diff -ur camd/Lib/GNUmakefile camd-shared/Lib/GNUmakefile
---- camd/Lib/GNUmakefile       2007-12-02 19:00:35.000000000 +0100
-+++ camd-shared/Lib/GNUmakefile        2007-12-02 18:59:22.000000000 +0100
+--- CAMD/Lib/GNUmakefile.orig  2014-10-01 20:15:40.442951733 +0200
++++ CAMD/Lib/GNUmakefile       2014-10-01 20:41:30.242886694 +0200
 @@ -2,7 +2,7 @@
  # CAMD Makefile for compiling on Unix systems (for GNU make only)
  #-------------------------------------------------------------------------------
@@ -38,40 +36,36 @@ diff -ur camd/Lib/GNUmakefile camd-shared/Lib/GNUmakefile
 -default: libcamd.a
 +default: libcamd.la
  
- include /usr/share/misc/UFconfig.mk
+ include /usr/share/misc/SuiteSparse_config.mk
  
-@@ -29,21 +29,24 @@
+@@ -29,18 +29,21 @@
  #-------------------------------------------------------------------------------
  
- camd_global.o: ../Source/camd_global.c $(INC)
--      $(C) -c $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@
- 
  camd_i_%.o: ../Source/camd_%.c $(INC)
 -      $(C) -DDINT -c $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
  
  camd_l_%.o: ../Source/camd_%.c $(INC)
 -      $(C) -DDLONG -c $< -o $@
-+      libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CONFIG) -I../Include -c $< -o $@
++      libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
  
  #-------------------------------------------------------------------------------
  # Create the libcamd.a library (C versions only)
  #-------------------------------------------------------------------------------
  
--libcamd.a: camd_global.o $(CAMDI) $(CAMDL)
--      $(AR) libcamd.a $^
+-libcamd.a: $(CAMDI) $(CAMDL)
+-      $(ARCHIVE)  libcamd.a $^
 -      - $(RANLIB) libcamd.a
-+libcamd.la: camd_global.o $(CAMDI) $(CAMDL)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcamd.la -rpath $(libdir) $^ -lm
++libcamd.la: $(CAMDI) $(CAMDL)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcamd.la -rpath $(libdir) $(^:.o=.lo) -lsuitesparseconfig -lm
 +
 +install: libcamd.la
 +      install -d $(DESTDIR)$(libdir)
-+      libtool --mode=install cp libcamd.la $(DESTDIR)$(libdir)/libcamd.la
++      libtool --mode=install install libcamd.la $(DESTDIR)$(libdir)
  
  #-------------------------------------------------------------------------------
  # Remove all but the files in the original distribution
-@@ -73,4 +71,4 @@
+@@ -52,4 +55,4 @@
  purge: distclean
  
  distclean: clean