From b5c89460e820a4bdf03f55b91bbbfc66ea8b2d59 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 14 Oct 2010 05:34:33 +0000 Subject: [PATCH] - updated to 5.5.0 - updated ufconfig,shared patches Changed files: UMFPACK-shared.patch -> 1.7 UMFPACK-ufconfig.patch -> 1.2 UMFPACK.spec -> 1.9 --- UMFPACK-shared.patch | 214 ++++++++++++++++++++++------------------- UMFPACK-ufconfig.patch | 52 +++------- UMFPACK.spec | 8 +- 3 files changed, 134 insertions(+), 140 deletions(-) diff --git a/UMFPACK-shared.patch b/UMFPACK-shared.patch index 200f516..948ddb5 100644 --- a/UMFPACK-shared.patch +++ b/UMFPACK-shared.patch @@ -1,12 +1,8 @@ -diff -ur UMFPACK/Demo/Makefile UMFPACK.shared/Demo/Makefile ---- UMFPACK/Demo/Makefile 2007-12-07 01:52:29.000000000 +0100 -+++ UMFPACK.shared/Demo/Makefile 2007-12-07 01:58:48.000000000 +0100 -@@ -9,23 +9,19 @@ +--- UMFPACK/Demo/Makefile.orig 2010-10-13 19:57:37.299742720 +0200 ++++ UMFPACK/Demo/Makefile 2010-10-13 20:18:51.035741882 +0200 +@@ -17,35 +17,14 @@ - include /usr/share/misc/UFconfig.mk - --C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include -+C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd + C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I/usr/include/amd -INC = ../Include/umfpack.h ../../AMD/Include/amd.h +INC = ../Include/umfpack.h @@ -21,16 +17,30 @@ diff -ur UMFPACK/Demo/Makefile UMFPACK.shared/Demo/Makefile -../../AMD/Lib/libamd.a: - ( cd ../../AMD ; $(MAKE) library ) - --UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a +-../../CHOLMOD/Lib/libcholmod.a: +- ( cd ../../CHOLMOD ; $(MAKE) library ) +- +-../../COLAMD/Lib/libcolamd.a: +- ( cd ../../COLAMD ; $(MAKE) library ) +- +-../../CCOLAMD/Lib/libccolamd.a: +- ( cd ../../CCOLAMD ; $(MAKE) library ) +- +-../../CAMD/Lib/libcamd.a: +- ( cd ../../CAMD ; $(MAKE) library ) +- +-../../metis-4.0/libmetis.a: +- ( cd ../../metis-4.0/Lib ; $(MAKE) ) +- +-UMFPACK = ../Lib/libumfpack.a ../../AMD/Lib/libamd.a \ +- ../../CHOLMOD/Lib/libcholmod.a ../../COLAMD/Lib/libcolamd.a \ +- ../../CAMD/Lib/libcamd.a ../../metis-4.0/libmetis.a \ +- ../../CCOLAMD/Lib/libccolamd.a +UMFPACK = ../Lib/libumfpack.la - libs: - ( cd ../Lib ; $(MAKE) ) -- ( cd ../../AMD ; $(MAKE) library ) + libs: $(UMFPACK) - #------------------------------------------------------------------------------- - # Create the demo programs, run them, and compare the output -@@ -34,7 +30,7 @@ +@@ -56,7 +35,7 @@ dist: umfpack_di_demo.c umfpack_dl_demo.c umfpack_zi_demo.c umfpack_zl_demo.c umfpack_simple: umfpack_simple.c $(INC) $(UMFPACK) @@ -39,7 +49,7 @@ diff -ur UMFPACK/Demo/Makefile UMFPACK.shared/Demo/Makefile # the GNU rules are simpler: # umfpack_%_demo.c: umfpack_xx_demo.c umfpack_%_demo.sed -@@ -51,28 +47,28 @@ +@@ -73,28 +52,28 @@ - sed -f umfpack_di_demo.sed < umfpack_xx_demo.c > umfpack_di_demo.c umfpack_di_demo: umfpack_di_demo.c $(INC) $(UMFPACK) @@ -72,25 +82,18 @@ diff -ur UMFPACK/Demo/Makefile UMFPACK.shared/Demo/Makefile run: umfpack_di_demo umfpack_zi_demo umfpack_dl_demo umfpack_zl_demo umfpack_simple ./umfpack_simple -diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile ---- UMFPACK/Lib/GNUmakefile 2007-12-07 01:52:29.000000000 +0100 -+++ UMFPACK.shared/Lib/GNUmakefile 2007-12-07 02:08:48.000000000 +0100 -@@ -2,12 +2,11 @@ +--- UMFPACK/Lib/GNUmakefile.orig 2010-10-13 20:56:34.119741882 +0200 ++++ UMFPACK/Lib/GNUmakefile 2010-10-13 20:57:29.679734339 +0200 +@@ -2,7 +2,7 @@ # UMFPACK Makefile for compiling on Unix systems (for GNU Make) #------------------------------------------------------------------------------- --default: ../Lib/libumfpack.a -+default: ../Lib/libumfpack.la +-default: libumfpack.a ++default: libumfpack.la include /usr/share/misc/UFconfig.mk --C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) \ -- -I../Include -I../Source -I../../AMD/Include -+C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd - - #------------------------------------------------------------------------------- - # source files -@@ -71,8 +70,7 @@ +@@ -71,8 +71,7 @@ $(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \ $(addprefix ../Source/, $(addsuffix .h,$(UMFINT))) \ $(addprefix ../Include/, $(addsuffix .h,$(USER))) \ @@ -100,16 +103,16 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile #------------------------------------------------------------------------------- # object files for each version -@@ -91,146 +89,146 @@ +@@ -91,171 +90,171 @@ #------------------------------------------------------------------------------- umf_i_%.o: ../Source/umf_%.c $(INC) - $(C) -DDINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@ umf_l_%.o: ../Source/umf_%.c $(INC) - $(C) -DDLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@ #------------------------------------------------------------------------------- # compile each routine in the DI version @@ -117,43 +120,43 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile umf_di_%.o: ../Source/umf_%.c $(INC) - $(C) -DDINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@ umf_di_%hsolve.o: ../Source/umf_%tsolve.c $(INC) - $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DCONJUGATE_SOLVE -c $< -o $@ umf_di_triplet_map_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@ umf_di_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DDINT -DDO_MAP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DDO_MAP -c $< -o $@ umf_di_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DDINT -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DDO_VALUES -c $< -o $@ umf_di_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DDINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@ umf_di_assemble_fixq.o: ../Source/umf_assemble.c $(INC) - $(C) -DDINT -DFIXQ -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DFIXQ -c $< -o $@ umf_di_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) - $(C) -DDINT -DDROP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DDROP -c $< -o $@ umfpack_di_wsolve.o: ../Source/umfpack_solve.c $(INC) - $(C) -DDINT -DWSOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -DWSOLVE -c $< -o $@ umfpack_di_%.o: ../Source/umfpack_%.c $(INC) - $(C) -DDINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@ #------------------------------------------------------------------------------- # compile each routine in the DL version @@ -161,43 +164,43 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile umf_dl_%.o: ../Source/umf_%.c $(INC) - $(C) -DDLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@ umf_dl_%hsolve.o: ../Source/umf_%tsolve.c $(INC) - $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DCONJUGATE_SOLVE -c $< -o $@ umf_dl_triplet_map_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@ umf_dl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DDLONG -DDO_MAP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DDO_MAP -c $< -o $@ umf_dl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DDLONG -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DDO_VALUES -c $< -o $@ umf_dl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DDLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@ umf_dl_assemble_fixq.o: ../Source/umf_assemble.c $(INC) - $(C) -DDLONG -DFIXQ -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DFIXQ -c $< -o $@ umf_dl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) - $(C) -DDLONG -DDROP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DDROP -c $< -o $@ umfpack_dl_wsolve.o: ../Source/umfpack_solve.c $(INC) - $(C) -DDLONG -DWSOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -DWSOLVE -c $< -o $@ umfpack_dl_%.o: ../Source/umfpack_%.c $(INC) - $(C) -DDLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@ #------------------------------------------------------------------------------- # compile each routine in the ZI version @@ -205,43 +208,43 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile umf_zi_%.o: ../Source/umf_%.c $(INC) - $(C) -DZINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -c $< -o $@ umf_zi_%hsolve.o: ../Source/umf_%tsolve.c $(INC) - $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DCONJUGATE_SOLVE -c $< -o $@ umf_zi_triplet_map_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DDO_MAP -DDO_VALUES -c $< -o $@ umf_zi_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DZINT -DDO_MAP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DDO_MAP -c $< -o $@ umf_zi_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DZINT -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DDO_VALUES -c $< -o $@ umf_zi_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DZINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -c $< -o $@ umf_zi_assemble_fixq.o: ../Source/umf_assemble.c $(INC) - $(C) -DZINT -DFIXQ -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DFIXQ -c $< -o $@ umf_zi_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) - $(C) -DZINT -DDROP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DDROP -c $< -o $@ umfpack_zi_wsolve.o: ../Source/umfpack_solve.c $(INC) - $(C) -DZINT -DWSOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -DWSOLVE -c $< -o $@ umfpack_zi_%.o: ../Source/umfpack_%.c $(INC) - $(C) -DZINT -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZINT $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZINT -c $< -o $@ #------------------------------------------------------------------------------- # compile each routine in the ZL version @@ -249,96 +252,105 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile umf_zl_%.o: ../Source/umf_%.c $(INC) - $(C) -DZLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -c $< -o $@ umf_zl_%hsolve.o: ../Source/umf_%tsolve.c $(INC) - $(C) -DZLONG -DCONJUGATE_SOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DCONJUGATE_SOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ umf_zl_triplet_map_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_MAP -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DDO_MAP -DDO_VALUES -c $< -o $@ umf_zl_triplet_map_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DZLONG -DDO_MAP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_MAP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DDO_MAP -c $< -o $@ umf_zl_triplet_nomap_x.o: ../Source/umf_triplet.c $(INC) - $(C) -DZLONG -DDO_VALUES -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DDO_VALUES $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DDO_VALUES -c $< -o $@ umf_zl_triplet_nomap_nox.o: ../Source/umf_triplet.c $(INC) - $(C) -DZLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -c $< -o $@ umf_zl_assemble_fixq.o: ../Source/umf_assemble.c $(INC) - $(C) -DZLONG -DFIXQ -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DFIXQ $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DFIXQ -c $< -o $@ umf_zl_store_lu_drop.o: ../Source/umf_store_lu.c $(INC) - $(C) -DZLONG -DDROP -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DDROP $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DDROP -c $< -o $@ umfpack_zl_wsolve.o: ../Source/umfpack_solve.c $(INC) - $(C) -DZLONG -DWSOLVE -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG -DWSOLVE $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -DWSOLVE -c $< -o $@ umfpack_zl_%.o: ../Source/umfpack_%.c $(INC) - $(C) -DZLONG -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) -DZLONG $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -DZLONG -c $< -o $@ #------------------------------------------------------------------------------- # Create the generic routines (GN) using a generic rule -@@ -238,21 +236,25 @@ + #------------------------------------------------------------------------------- umfpack_gn_%.o: ../Source/umfpack_%.c $(INC) - $(C) -c $< -o $@ -+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../Source -I/usr/include/amd -c $< -o $@ +- $(C) -c $< -o $@ ++ libtool --tag=CC --mode=compile $(C) -c $< -o $@ #------------------------------------------------------------------------------- - # Create the ../Lib/libumfpack.a library + # Create the libumfpack.a library #------------------------------------------------------------------------------- --../Lib/libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) -- $(AR) ../Lib/libumfpack.a $^ -- - $(RANLIB) ../Lib/libumfpack.a -+../Lib/libumfpack.la: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) -+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $(^:.o=.lo) -lm -lamd -lblas -+ +-libumfpack.a: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) +- $(AR) libumfpack.a $^ +- - $(RANLIB) libumfpack.a ++libumfpack.la: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) ++ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libumfpack.la -rpath $(libdir) $(^:.o=.lo) -lm -lamd -lcholmod -lblas + +-so: $(II) $(LL) $(GN) $(DI) $(DL) $(ZI) $(ZL) +- gcc -shared -Wl,-soname,libumfpack.so -o libumfpack.so $^ +install: libumfpack.la + install -d $(DESTDIR)$(libdir) -+ libtool --mode=install cp libumfpack.la $(DESTDIR)$(libdir)/libumfpack.la ++ libtool --mode=install install libumfpack.la $(DESTDIR)$(libdir) #------------------------------------------------------------------------------- # Remove all but the files in the original distribution #------------------------------------------------------------------------------- purge: clean -- - $(RM) ../Lib/libumfpack.a -+ - $(RM) ../Lib/libumfpack.la +- - $(RM) libumfpack.a ++ - $(RM) libumfpack.la clean: - $(RM) $(CLEAN) ---- UMFPACK/Makefile~ 2007-12-07 01:52:29.000000000 +0100 -+++ UMFPACK/Makefile 2007-12-07 02:10:18.000000000 +0100 -@@ -11,8 +11,6 @@ +--- UMFPACK/Makefile.orig 2010-10-13 19:57:37.315740205 +0200 ++++ UMFPACK/Makefile 2010-10-13 20:23:19.519734339 +0200 +@@ -4,8 +4,6 @@ + + VERSION = 5.5.0 + +-# UMFPACK requires the AMD package to be in ../AMD +- + default: all + + include /usr/share/misc/UFconfig.mk +@@ -13,14 +11,12 @@ # compile all C code (except hb, fortran, and fortran64), including AMD and the - # MATLAB mexFunctions + # demos, but not the MATLAB mexFunctions all: - ( cd ../AMD ; $(MAKE) library ) -- ( cd ../AMD ; $(MAKE) mex ) ( cd Lib ; $(MAKE) ) ( cd Demo ; $(MAKE) ) - ( cd MATLAB ; $(MAKE) ) -@@ -20,7 +18,6 @@ + - cat Doc/License # compile just the C-callable libraries and demo programs (not mexFunctions) library: - ( cd ../AMD ; $(MAKE) library ) ( cd Lib ; $(MAKE) ) - ( cd Demo ; $(MAKE) ) - - cat Doc/License -@@ -39,7 +36,6 @@ + + # compile the FORTRAN interface and demo program +@@ -37,7 +33,6 @@ # remove object files, but keep the compiled programs and library archives clean: @@ -346,7 +358,7 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile ( cd Lib ; $(MAKE) clean ) ( cd Demo ; $(MAKE) clean ) ( cd MATLAB ; $(MAKE) clean ) -@@ -47,7 +43,6 @@ +@@ -45,7 +40,6 @@ # clean, and then remove compiled programs and library archives purge: @@ -354,10 +366,10 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile ( cd Lib ; $(MAKE) purge ) ( cd Demo ; $(MAKE) purge ) ( cd MATLAB ; $(MAKE) purge ) -@@ -55,12 +50,10 @@ +@@ -53,12 +47,10 @@ # create PDF documents for the original distribution - doc: + docs: - ( cd ../AMD ; $(MAKE) doc ) ( cd Doc ; $(MAKE) ) @@ -367,11 +379,11 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK.shared/Lib/GNUmakefile ( cd Demo ; $(MAKE) dist ) ( cd Doc ; $(MAKE) ) -@@ -70,7 +63,6 @@ +@@ -68,7 +60,6 @@ - # compile the MATLAB mexFunction + # compile the MATLAB mexFunction for AMD (but not UMFPACK) mex: - ( cd ../AMD/MATLAB ; $(MAKE) ) - ( cd MATLAB ; $(MAKE) ) + # ( cd MATLAB ; $(MAKE) ) # statement coverage (requires Linux; takes a lot of time and disk space) diff --git a/UMFPACK-ufconfig.patch b/UMFPACK-ufconfig.patch index 63edbdd..adc77ef 100644 --- a/UMFPACK-ufconfig.patch +++ b/UMFPACK-ufconfig.patch @@ -10,14 +10,13 @@ diff -ur UMFPACK/Demo/Makefile UMFPACK-uf/Demo/Makefile -C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \ - -I../../UFconfig -+C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include ++C = $(CC) $(CFLAGS) $(UMFPACK_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 LIBS = $(BLAS) $(XERBLA) $(LIB) -Only in UMFPACK-uf/Demo: Makefile~ diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile --- UMFPACK/Doc/Makefile 2006-01-30 17:51:24.000000000 +0100 +++ UMFPACK-uf/Doc/Makefile 2007-12-02 19:19:00.000000000 +0100 @@ -30,24 +29,24 @@ diff -ur UMFPACK/Doc/Makefile UMFPACK-uf/Doc/Makefile #------------------------------------------------------------------------------- # Remove all but the files in the original distribution -Only in UMFPACK-uf/Doc: Makefile~ -diff -ur UMFPACK/Lib/GNUmakefile UMFPACK-uf/Lib/GNUmakefile ---- UMFPACK/Lib/GNUmakefile 2007-05-06 14:31:22.000000000 +0200 -+++ UMFPACK-uf/Lib/GNUmakefile 2007-12-02 19:20:09.000000000 +0100 -@@ -4,10 +4,10 @@ +--- 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 @@ - default: ../Lib/libumfpack.a + 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../Include -I../Source -I../../AMD/Include +- -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 -@@ -65,7 +65,7 @@ +@@ -67,7 +65,7 @@ # include files: #------------------------------------------------------------------------------- @@ -56,7 +55,6 @@ diff -ur UMFPACK/Lib/GNUmakefile UMFPACK-uf/Lib/GNUmakefile ../Source/umf_config.h ../Source/umf_version.h \ ../Source/umf_internal.h ../Source/umf_triplet.h \ $(addprefix ../Source/, $(addsuffix .h,$(UMFCH))) \ -Only in UMFPACK-uf/Lib: GNUmakefile~ diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile --- UMFPACK/Lib/Makefile 2007-05-05 21:50:23.000000000 +0200 +++ UMFPACK-uf/Lib/Makefile 2007-12-02 19:19:20.000000000 +0100 @@ -69,7 +67,6 @@ diff -ur UMFPACK/Lib/Makefile UMFPACK-uf/Lib/Makefile C = $(CC) $(CFLAGS) $(UMFPACK_CONFIG) -I../Include -I../../AMD/Include \ -I../Source -Only in UMFPACK-uf/Lib: Makefile~ diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile --- UMFPACK/Makefile 2007-10-30 23:03:55.000000000 +0100 +++ UMFPACK-uf/Makefile 2007-12-02 19:21:14.000000000 +0100 @@ -82,33 +79,17 @@ diff -ur UMFPACK/Makefile UMFPACK-uf/Makefile # compile all C code (except hb, fortran, and fortran64), including AMD and the # MATLAB mexFunctions -Only in UMFPACK-uf: Makefile~ -diff -ur UMFPACK/MATLAB/GNUmakefile UMFPACK-uf/MATLAB/GNUmakefile ---- UMFPACK/MATLAB/GNUmakefile 2007-05-06 04:55:06.000000000 +0200 -+++ UMFPACK-uf/MATLAB/GNUmakefile 2007-12-02 19:20:41.000000000 +0100 -@@ -4,9 +4,9 @@ - - default: umfpack2 luflop +--- UMFPACK/MATLAB/Makefile.orig 2009-11-11 21:10:02.000000000 +0100 ++++ UMFPACK/MATLAB/Makefile 2010-10-13 09:39:55.187740205 +0200 +@@ -5,7 +5,7 @@ + default: + - echo "Use umfpack_make.m in MATLAB to compile the UMFPACK mexFunction" -include ../../UFconfig/UFconfig.mk +include /usr/share/misc/UFconfig.mk --I = -I../Include -I../Source -I../../AMD/Include -I../../UFconfig -+I = -I../Include -I../Source -I../../AMD/Include - - MX = $(MEX) $(I) - -@@ -74,8 +74,7 @@ - # include files: #------------------------------------------------------------------------------- - --AMDH = ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h \ -- ../../UFconfig/UFconfig.h -+AMDH = ../../AMD/Include/amd_internal.h ../../AMD/Include/amd.h - - INC1 = umf_config.h umf_version.h umf_internal.h umf_triplet.h - -Only in UMFPACK-uf/MATLAB: GNUmakefile~ + # Remove all but the files in the original distribution diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile --- UMFPACK/Tcov/Makefile 2006-12-01 13:47:48.000000000 +0100 +++ UMFPACK-uf/Tcov/Makefile 2007-12-02 19:21:03.000000000 +0100 @@ -119,4 +100,3 @@ diff -ur UMFPACK/Tcov/Makefile UMFPACK-uf/Tcov/Makefile linux: distclean ./DO.linux -Only in UMFPACK-uf/Tcov: Makefile~ diff --git a/UMFPACK.spec b/UMFPACK.spec index 4e75ed6..bd40f7d 100644 --- a/UMFPACK.spec +++ b/UMFPACK.spec @@ -1,17 +1,18 @@ Summary: UMFPACK: sparse multifrontal LU factorization Summary(pl.UTF-8): UMFPACK - wielofrontalny rozkład LU macierzy rzadkich Name: UMFPACK -Version: 5.2.0 -Release: 2 +Version: 5.5.0 +Release: 1 License: GPL v2+ Group: Libraries Source0: http://www.cise.ufl.edu/research/sparse/umfpack/%{name}-%{version}.tar.gz -# Source0-md5: 8ad2d68c7c49dfcdd8321e806e6c611c +# Source0-md5: 19f5d8b4231ec9114718641ce51cce6e Patch0: %{name}-ufconfig.patch Patch1: %{name}-shared.patch Patch2: %{name}-include-AMD.patch URL: http://www.cise.ufl.edu/research/sparse/umfpack/ BuildRequires: AMD-devel +BuildRequires: CHOLMOD-devel BuildRequires: UFconfig BuildRequires: blas-devel BuildRequires: libtool >= 2:1.5 @@ -42,6 +43,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki UMFPACK Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: AMD-devel +Requires: CHOLMOD-devel Requires: UFconfig %description devel -- 2.44.0