UMFPACK-ufconfig.patch

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