UMFPACK-ufconfig.patch

   1 --- UMFPACK/Demo/Makefile.orig  2011-12-14 18:45:15.000000000 +0100
   2 +++ UMFPACK/Demo/Makefile       2012-01-06 08:03:34.253327243 +0100
   3 @@ -13,7 +13,7 @@
   4
   5  all64: libs run hb fortran64
   6
   7 -include ../../SuiteSparse_config/SuiteSparse_config.mk
   8 +include /usr/share/misc/SuiteSparse_config.mk
   9
  10  #-------------------------------------------------------------------------------
  11  # the optional Partition module requires METIS, CAMD, and CCOLAMD
  12 @@ -23,35 +23,28 @@
  13  LIB_WITH_CHOLMOD =
  14  ifeq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
  15      # CHOLMOD is requested.  See if it is available
  16 -    ifeq (../../CHOLMOD, $(wildcard ../../CHOLMOD))
  17 -        ifeq (../../COLAMD, $(wildcard ../../COLAMD))
  18 +    ifeq ($(WITH_CHOLMOD), 1)
  19 +        # assume COLAMD available
  20              # CHOLMOD and COLAMD are available
  21              CONFIG1 =
  22 -            LIB_WITH_CHOLMOD = ../../CHOLMOD/Lib/libcholmod.a \
  23 -                ../../COLAMD/Lib/libcolamd.a
  24 +            LIB_WITH_CHOLMOD = -lcholmod -lcolamd
  25              # check if METIS is requested and available
  26              ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
  27                  # METIS is requested.  See if it is available
  28 -                ifeq ($(METIS), $(wildcard $(METIS)))
  29 -                    ifeq (../../CAMD, $(wildcard ../../CAMD))
  30 -                        ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
  31 +                ifeq ($(WITH_METIS), 1)
  32 +                    # assume CAMD and CCOLAMD are available
  33                              CONFIG2 =
  34 -                            LIB_WITH_PARTITION = $(METIS) \
  35 -                                ../../CCOLAMD/Lib/libccolamd.a \
  36 -                                ../../CAMD/Lib/libcamd.a
  37 -                        endif
  38 -                    endif
  39 +                            LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
  40                  endif
  41              endif
  42 -        endif
  43      endif
  44  endif
  45  #-------------------------------------------------------------------------------
  46
  47  C = $(CC) $(CF) $(UMFPACK_CONFIG) $(CONFIG1) $(CONFIG2) \
  48 -    -I../Include -I../../AMD/Include -I../../SuiteSparse_config
  49 +    -I../Include -I/usr/include/amd
  50
  51 -INC = ../Include/umfpack.h ../../AMD/Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
  52 +INC = ../Include/umfpack.h
  53
  54  LIBS = $(BLAS) $(XERBLA) $(LIB) $(LIB_WITH_CHOLMOD) $(LIB_WITH_PARTITION)
  55
  56 diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile
  57 --- UMFPACK/Doc/Makefile        2006-01-30 17:51:24.000000000 +0100
  58 +++ UMFPACK-uf/Doc/Makefile     2007-12-02 19:19:00.000000000 +0100
  59 @@ -7,7 +7,7 @@
  60
  61  default: dist
  62
  63 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  64 +include /usr/share/misc/SuiteSparse_config.mk
  65
  66  #-------------------------------------------------------------------------------
  67  # Remove all but the files in the original distribution
  68 --- UMFPACK/Lib/GNUmakefile.orig        2012-05-28 01:23:50.000000000 +0200
  69 +++ UMFPACK/Lib/GNUmakefile     2012-06-27 20:04:57.011651575 +0200
  70 @@ -4,14 +4,14 @@
  71
  72  default: libumfpack.a
  73
  74 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  75 +include /usr/share/misc/SuiteSparse_config.mk
  76
  77  # UMFPACK can use CHOLMOD by default as an ordering option
  78  ifneq (,$(findstring -DNCHOLMOD, $(UMFPACK_CONFIG)))
  79 -    I = -I../Include -I../Source -I../../AMD/Include -I../../SuiteSparse_config
  80 +    I = -I../Include -I../Source -I/usr/include/amd
  81  else
  82 -    I = -I../Include -I../Source -I../../AMD/Include \
  83 -        -I../../SuiteSparse_config -I../../CHOLMOD/Include
  84 +    I = -I../Include -I../Source -I/usr/include/amd \
  85 +        -I/usr/include/cholmod
  86  endif
  87
  88  C = $(CC) $(CF) $(UMFPACK_CONFIG) $(I)
  89 @@ -75,7 +75,7 @@
  90  # include files:
  91  #-------------------------------------------------------------------------------
  92
  93 -INC = ../Include/umfpack.h ../../SuiteSparse_config/SuiteSparse_config.h \
  94 +INC = ../Include/umfpack.h \
  95         ../Source/umf_config.h ../Source/umf_version.h \
  96         ../Source/umf_internal.h ../Source/umf_triplet.h \
  97         $(addprefix ../Source/,  $(addsuffix .h,$(UMFCH))) \
  98 diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile
  99 --- UMFPACK/Lib/Makefile        2007-05-05 21:50:23.000000000 +0200
 100 +++ UMFPACK-uf/Lib/Makefile     2007-12-02 19:19:20.000000000 +0100
 101 @@ -8,7 +8,7 @@
 102
 103  default: everything
 104
 105 -include ../../SuiteSparse_config/SuiteSparse_config.mk
 106 +include /usr/share/misc/SuiteSparse_config.mk
 107
 108  C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \
 109      -I../Source
 110 diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile
 111 --- UMFPACK/Makefile    2007-10-30 23:03:55.000000000 +0100
 112 +++ UMFPACK-uf/Makefile 2007-12-02 19:21:14.000000000 +0100
 113 @@ -6,7 +6,7 @@
 114
 115  default: library
 116
 117 -include ../SuiteSparse_config/SuiteSparse_config.mk
 118 +include /usr/share/misc/SuiteSparse_config.mk
 119
 120  # compile all C code (except hb, fortran, and fortran64), including AMD and the
 121  # MATLAB mexFunctions
 122 --- UMFPACK/MATLAB/Makefile.orig        2009-11-11 21:10:02.000000000 +0100
 123 +++ UMFPACK/MATLAB/Makefile     2010-10-13 09:39:55.187740205 +0200
 124 @@ -5,7 +5,7 @@
 125  default:
 126         - echo "Use umfpack_make.m in MATLAB to compile the UMFPACK mexFunction"
 127
 128 -include ../../SuiteSparse_config/SuiteSparse_config.mk
 129 +include /usr/share/misc/SuiteSparse_config.mk
 130
 131  #-------------------------------------------------------------------------------
 132  # Remove all but the files in the original distribution
 133 diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile
 134 --- UMFPACK/Tcov/Makefile       2006-12-01 13:47:48.000000000 +0100
 135 +++ UMFPACK-uf/Tcov/Makefile    2007-12-02 19:21:03.000000000 +0100
 136 @@ -1,5 +1,5 @@
 137
 138 -include ../../SuiteSparse_config/SuiteSparse_config.mk
 139 +include /usr/share/misc/SuiteSparse_config.mk
 140
 141  linux: distclean
 142         ./DO.linux