X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=UMFPACK-ufconfig.patch;h=ec6cdadd9bb934ae4e775b642a4bbce8e384097b;hb=a25446b90843de87f03b9f2ad5f597b25b3adb2a;hp=adc77effbfc93dbcbdfeb69fd0cfd9e930ab474d;hpb=b5c89460e820a4bdf03f55b91bbbfc66ea8b2d59;p=packages%2FUMFPACK.git

diff --git a/UMFPACK-ufconfig.patch b/UMFPACK-ufconfig.patch
index adc77ef..ec6cdad 100644
--- a/UMFPACK-ufconfig.patch
+++ b/UMFPACK-ufconfig.patch
@@ -1,21 +1,57 @@
-diff -ur UMFPACK/Demo/Makefile UMFPACK-uf/Demo/Makefile
---- UMFPACK/Demo/Makefile	2007-05-05 21:56:55.000000000 +0200
-+++ UMFPACK-uf/Demo/Makefile	2007-12-02 19:18:50.000000000 +0100
-@@ -7,12 +7,11 @@
+--- UMFPACK/Demo/Makefile.orig	2011-12-14 18:45:15.000000000 +0100
++++ UMFPACK/Demo/Makefile	2012-01-06 08:03:34.253327243 +0100
+@@ -13,7 +13,7 @@
  
- default: libs run
+ all64: libs run hb fortran64
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
--C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
--    -I../../UFconfig
-+C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd
+ #-------------------------------------------------------------------------------
+ # the optional Partition module requires METIS, CAMD, and CCOLAMD
+@@ -23,35 +23,28 @@
+ LIB_WITH_CHOLMOD =
+ ifeq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
+     # CHOLMOD is requested.  See if it is available
+-    ifeq (../../CHOLMOD, $(wildcard ../../CHOLMOD))
+-        ifeq (../../COLAMD, $(wildcard ../../COLAMD))
++    ifeq ($(WITH_CHOLMOD), 1)
++        # assume COLAMD available
+             # CHOLMOD and COLAMD are available
+             CONFIG1 =
+-            LIB_WITH_CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
+-                ../../COLAMD/Lib/libcolamd.a
++            LIB_WITH_CHOLMOD = -lcholmod -lcolamd
+             # check if METIS is requested and available
+             ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+                 # METIS is requested.  See if it is available
+-                ifeq ($(METIS), $(wildcard $(METIS)))
+-                    ifeq (../../CAMD, $(wildcard ../../CAMD))
+-                        ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
++                ifeq ($(WITH_METIS), 1)
++                    # assume CAMD and CCOLAMD are available
+                             CONFIG2 =
+-                            LIB_WITH_PARTITION = $(METIS) \
+-                                ../../CCOLAMD/Lib/libccolamd.a \
+-                                ../../CAMD/Lib/libcamd.a
+-                        endif
+-                    endif
++                            LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
+                 endif
+             endif
+-        endif
+     endif
+ endif
+ #-------------------------------------------------------------------------------
+ 
+ C = $(CC) $(CF) $(UMFPACK_CONFIG) $(CONFIG1) $(CONFIG2) \
+-    -I../Include -I../../AMD/Include -I../../SuiteSparse_config
++    -I../Include -I/usr/include/amd
  
--INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../UFconfig/UFconfig.h
-+INC = ../Include/umfpack.h ../../AMD/Include/amd.h
+-INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
++INC = ../Include/umfpack.h
  
- LIBS = $(BLAS) $(XERBLA) $(LIB)
+ LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
  
 diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
 --- UMFPACK/Doc/Makefile	2006-01-30 17:51:24.000000000 +0100
@@ -24,33 +60,37 @@ diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
  
  default: dist
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  #-------------------------------------------------------------------------------
  # Remove all but the files in the original distribution
---- UMFPACK/Lib/GNUmakefile.orig	2009-11-11 21:09:54.000000000 +0100
-+++ UMFPACK/Lib/GNUmakefile	2010-10-13 19:56:54.827741882 +0200
-@@ -4,12 +4,10 @@
+--- UMFPACK/Lib/GNUmakefile.orig	2012-05-28 01:23:50.000000000 +0200
++++ UMFPACK/Lib/GNUmakefile	2012-06-27 20:04:57.011651575 +0200
+@@ -4,14 +4,14 @@
  
  default: libumfpack.a
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
- 
- C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \
--    -I../Include -I../Source -I../../AMD/Include -I../../UFconfig \
--    -I../../CCOLAMD/Include -I../../CAMD/Include -I../../CHOLMOD/Include \
--    -I../../metis-4.0/Lib -I../../COLAMD/Include
-+    -I../Include -I../Source -I/usr/include/amd -I/usr/include/cholmod
- 
- #-------------------------------------------------------------------------------
- # source files
-@@ -67,7 +65,7 @@
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
+ 
+ # UMFPACK can use CHOLMOD by default as an ordering option
+ ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
+-    I = -I../Include -I../Source -I../../AMD/Include -I../../SuiteSparse_config
++    I = -I../Include -I../Source -I/usr/include/amd
+ else
+-    I = -I../Include -I../Source -I../../AMD/Include \
+-        -I../../SuiteSparse_config -I../../CHOLMOD/Include
++    I = -I../Include -I../Source -I/usr/include/amd \
++        -I/usr/include/cholmod
+ endif
+ 
+ C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
+@@ -75,7 +75,7 @@
  # include files:
  #-------------------------------------------------------------------------------
  
--INC = ../Include/umfpack.h ../../UFconfig/UFconfig.h \
+-INC = ../Include/umfpack.h ../../SuiteSparse_config/SuiteSparse_config.h \
 +INC = ../Include/umfpack.h \
  	../Source/umf_config.h ../Source/umf_version.h \
  	../Source/umf_internal.h ../Source/umf_triplet.h \
@@ -62,8 +102,8 @@ diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile
  
  default: everything
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
      -I../Source
@@ -74,8 +114,8 @@ diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile
  
  default: library
  
--include ../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  # compile all C code (except hb, fortran, and fortran64), including AMD and the
  # MATLAB mexFunctions
@@ -85,8 +125,8 @@ diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile
  default:
  	- echo "Use umfpack_make.m in MATLAB to compile the UMFPACK mexFunction"
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  #-------------------------------------------------------------------------------
  # Remove all but the files in the original distribution
@@ -95,8 +135,8 @@ diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile
 +++ UMFPACK-uf/Tcov/Makefile	2007-12-02 19:21:03.000000000 +0100
 @@ -1,5 +1,5 @@
  
--include ../../UFconfig/UFconfig.mk
-+include /usr/share/misc/UFconfig.mk
+-include ../../SuiteSparse_config/SuiteSparse_config.mk
++include /usr/share/misc/SuiteSparse_config.mk
  
  linux: distclean
  	./DO.linux