SPQR-ufconfig.patch

   1 --- SPQR/Makefile.orig  2011-12-07 23:20:52.000000000 +0100
   2 +++ SPQR/Makefile       2012-01-07 15:26:12.640442839 +0100
   3 @@ -4,7 +4,7 @@
   4
   5  VERSION = 1.2.3
   6
   7 -include ../SuiteSparse_config/SuiteSparse_config.mk
   8 +include /usr/share/misc/SuiteSparse_config.mk
   9
  10  default: all
  11
  12 --- SPQR/Lib/Makefile.orig      2012-06-21 07:37:08.000000000 +0200
  13 +++ SPQR/Lib/Makefile   2012-08-28 19:36:19.380393578 +0200
  14 @@ -6,7 +6,7 @@
  15
  16  ccode: all
  17
  18 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  19 +include /usr/share/misc/SuiteSparse_config.mk
  20
  21  #-------------------------------------------------------------------------------
  22  # the optional Partition module requires METIS, CAMD, and CCOLAMD
  23 @@ -15,18 +15,13 @@
  24  CONFIG = -DNPARTITION
  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_PATH), $(wildcard $(METIS_PATH)))
  29 -        ifeq (../../CAMD, $(wildcard ../../CAMD))
  30 -            ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
  31 +    # METIS is requested.
  32 +    ifeq ($(WITH_METIS), 1)
  33                  # METIS, CAMD, and CCOLAMD are available
  34 -                LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
  35 -                    ../../CAMD/Lib/libcamd.a
  36 -                I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
  37 -                    -I../../CCOLAMD/Include -I../../CAMD/Include
  38 +                LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd
  39 +                I_WITH_PARTITION = -I/usr/include/metis \
  40 +                    -I/usr/include/ccolamd -I/usr/include/camd
  41                  CONFIG =
  42 -            endif
  43 -        endif
  44      endif
  45  endif
  46  #-------------------------------------------------------------------------------
  47 @@ -97,7 +92,7 @@
  48
  49  $(OBJ): $(INC)
  50
  51 -I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include
  52 +I = -I/usr/include/cholmod -I../Include
  53
  54  C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I)
  55
  56 --- SPQR/Demo/Makefile.orig     2012-06-21 07:47:51.000000000 +0200
  57 +++ SPQR/Demo/Makefile  2012-08-28 19:38:04.650391386 +0200
  58 @@ -6,7 +6,7 @@
  59
  60  ccode: all
  61
  62 -include ../../SuiteSparse_config/SuiteSparse_config.mk
  63 +include /usr/share/misc/SuiteSparse_config.mk
  64
  65  #-------------------------------------------------------------------------------
  66  # the optional Partition module requires METIS, CAMD, and CCOLAMD
  67 @@ -15,26 +15,20 @@
  68  CONFIG = -DNPARTITION
  69  # check if METIS is requested and available
  70  ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
  71 -    # METIS is requested.  See if it is available
  72 -    ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
  73 -        ifeq (../../CAMD, $(wildcard ../../CAMD))
  74 -            ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
  75 -                # METIS, CAMD, and CCOLAMD are available
  76 -                LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
  77 -                    ../../CAMD/Lib/libcamd.a
  78 -                I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
  79 -                    -I../../CCOLAMD/Include -I../../CAMD/Include
  80 +    # METIS is requested.
  81 +    ifeq ($(WITH_METIS), 1)
  82 +                LIB_WITH_PARTITION = -lmetis -lccolamd -lcamd
  83 +                I_WITH_PARTITION = -I/usr/include/metis \
  84 +                    -I/usr/include/ccolamd -I/usr/include/camd
  85                  CONFIG =
  86 -            endif
  87 -        endif
  88      endif
  89  endif
  90  #-------------------------------------------------------------------------------
  91
  92  CLIB = ../Lib/libspqr.a \
  93 -        ../../SuiteSparse_config/libsuitesparseconfig.a \
  94 -       ../../CHOLMOD/Lib/libcholmod.a ../../AMD/Lib/libamd.a \
  95 -       ../../COLAMD/Lib/libcolamd.a $(LIB_WITH_PARTITION)
  96 +        -lsuitesparseconfig \
  97 +       -lcholmod -lamd \
  98 +       -lcolamd $(LIB_WITH_PARTITION)
  99
 100  # use the BLAS and LAPACK defined by SuiteSparse_config.mk; do not use valgrind
 101  FLIB = $(LAPACK) $(BLAS)
 102 @@ -145,7 +139,7 @@
 103         ../Include/SuiteSparseQR_definitions.h \
 104         ../Include/SuiteSparseQR.hpp Makefile
 105
 106 -I = -I../../CHOLMOD/Include -I../../SuiteSparse_config -I../Include
 107 +I = -I/usr/include/cholmod -I../Include
 108
 109  C = $(CXX) $(CF) $(SPQR_CONFIG) $(CONFIG) $(I)
 110