Author: qboosh Date: Thu Jan 5 20:36:14 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.7.4
- updated shared patch
- added metis patch to use metis 5.0.x
---- Files affected:
packages/CHOLMOD:
CHOLMOD-shared.patch (1.6 -> 1.7) , CHOLMOD-ufconfig.patch (1.1 -> 1.2) ,
CHOLMOD.spec (1.11 -> 1.12) , CHOLMOD-metis.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/CHOLMOD/CHOLMOD-shared.patch
diff -u packages/CHOLMOD/CHOLMOD-shared.patch:1.6
packages/CHOLMOD/CHOLMOD-shared.patch:1.7
--- packages/CHOLMOD/CHOLMOD-shared.patch:1.6 Sat Jan 5 00:21:54 2008
+++ packages/CHOLMOD/CHOLMOD-shared.patch Thu Jan 5 21:36:09 2012
@@ -1,63 +1,77 @@
-diff -ur CHOLMOD/Demo/Makefile CHOLMOD.shared/Demo/Makefile
---- CHOLMOD/Demo/Makefile 2007-12-07 12:29:51.000000000 +0100
-+++ CHOLMOD.shared/Demo/Makefile 2007-12-07 12:20:59.000000000 +0100
-@@ -11,12 +11,8 @@
-
-
#-------------------------------------------------------------------------------
- # With METIS, CCOLAMD, CAMD, and the Partition Module:
--LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a
../../COLAMD/Lib/libcolamd.a \
-- ../../CCOLAMD/Lib/libccolamd.a ../../CAMD/Lib/libcamd.a \
-- $(METIS) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
--# Use this instead, if you compile with -DNPARTITION:
--# LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a ../../COLAMD/libcolamd.a \
-- $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
-+LIB2 = ../Lib/libcholmod.la -lamd -lcolamd -lccolamd -lcamd \
-+ $(METIS) $(LAPACK) $(BLAS) $(LIB)
+--- CHOLMOD/Demo/Makefile.orig 2012-01-01 17:10:50.000000000 +0100
++++ CHOLMOD/Demo/Makefile 2012-01-01 17:13:20.706633471 +0100
+@@ -15,9 +15,8 @@
+ CONFIG =
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+ # check if METIS is available
+- ifeq (../../metis-4.0, $(wildcard ../../metis-4.0))
+- LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
+- ../../CAMD/Lib/libcamd.a
++ ifeq ($(WITH_METIS), 1)
++ LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
+ else
+ # METIS is not available, but CHOLMOD_CONFIG does not specify
+ # -DNPARTITION. Add it here so we can still compile CHOLMOD.
+@@ -26,7 +25,7 @@
+ endif
#-------------------------------------------------------------------------------
- C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
-@@ -48,32 +44,20 @@
- - $(RM) $(CLEAN)
+-LIB2 = ../Lib/libcholmod.a ../../AMD/Lib/libamd.a
../../COLAMD/Lib/libcolamd.a \
++LIB2 = -lcholmod -lamd -lcolamd \
+ $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS) $(XERBLA) $(LIB)
#-------------------------------------------------------------------------------
--# See below if you compile with -DNPARTITION
+@@ -63,27 +62,19 @@
+
#-------------------------------------------------------------------------------
+ # See below if you compile with -DNPARTITION
library:
- ( cd ../../UFconfig/xerbla ; $(MAKE) )
( cd ../Lib ; $(MAKE) )
- ( cd ../../AMD ; $(MAKE) library )
-- ( cd ../../CAMD ; $(MAKE) library )
- ( cd ../../COLAMD ; $(MAKE) library )
+-ifneq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+-else
- ( cd ../../CCOLAMD ; $(MAKE) library )
--# use this rule instead, if you compile with -DNPARTITION:
--# library:
--# ( cd ../../UFconfig/xerbla ; $(MAKE) )
--# ( cd ../Lib ; $(MAKE) )
--# ( cd ../../AMD ; $(MAKE) library )
--# ( cd ../../COLAMD ; $(MAKE) )
+- ( cd ../../CAMD ; $(MAKE) library )
+-endif
#-------------------------------------------------------------------------------
I = -I../Include
cholmod_demo: library cholmod_demo.c cholmod_demo.h
- $(C) -o cholmod_demo $(I) cholmod_demo.c $(LIB2)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(CHOLMOD_CONFIG) -I../Include -o cholmod_demo cholmod_demo.c $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o cholmod_demo $(I)
cholmod_demo.c $(LIB2)
cholmod_simple: library cholmod_simple.c
- $(C) -o cholmod_simple $(I) cholmod_simple.c $(LIB2)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(CHOLMOD_CONFIG) -I../Include -o cholmod_simple cholmod_simple.c $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o cholmod_simple $(I)
cholmod_simple.c $(LIB2)
cholmod_l_demo: library cholmod_l_demo.c cholmod_demo.h
- $(C) -o cholmod_l_demo $(I) cholmod_l_demo.c $(LIB2)
-+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS)
$(CHOLMOD_CONFIG) -I../Include -o cholmod_l_demo cholmod_l_demo.c $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -o cholmod_l_demo $(I)
cholmod_l_demo.c $(LIB2)
readhb: readhb.f
$(F77) $(FFLAGS) -o readhb readhb.f
-diff -ur CHOLMOD/Lib/Makefile CHOLMOD.shared/Lib/Makefile
---- CHOLMOD/Lib/Makefile 2007-12-07 12:29:51.000000000 +0100
-+++ CHOLMOD.shared/Lib/Makefile 2007-12-07 12:29:12.000000000 +0100
-@@ -10,14 +10,14 @@
+--- CHOLMOD/Lib/Makefile.orig 2012-01-01 17:10:50.673295114 +0100
++++ CHOLMOD/Lib/Makefile 2012-01-01 17:16:30.863306505 +0100
+@@ -11,12 +11,14 @@
+
#-------------------------------------------------------------------------------
+ # the optional Partition module requires METIS, CAMD, and CCOLAMD
+ I_WITH_PARTITION =
++LIB_WITH_PARTITION =
+ CONFIG =
+ ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+ # METIS is check if METIS is available
+ ifeq ($(WITH_METIS), 1)
+ I_WITH_PARTITION = -I/usr/include/metis \
+ -I/usr/include/ccolamd -I/usr/include/camd
++ LIB_WITH_PARTITION = $(METIS) -lccolamd -lcamd
+ else
+ # METIS is not available, but CHOLMOD_CONFIG does not specify
+ # -DNPARTITION. Add it here so we can still compile CHOLMOD.
+@@ -31,14 +33,14 @@
- C = $(CC) $(CFLAGS) $(CHOLMOD_CONFIG)
+ C = $(CC) $(CF) $(CHOLMOD_CONFIG) $(CONFIG)
-all: libcholmod.a
+all: libcholmod.la
@@ -73,16 +87,16 @@
clean:
- $(RM) $(CLEAN)
-@@ -109,39 +109,42 @@
+@@ -130,9 +132,13 @@
# to compile just the double/int version, use OBJ = $(DI)
OBJ = $(DI) $(DL)
-libcholmod.a: $(OBJ)
-- $(AR) libcholmod.a $(OBJ)
-- $(RANLIB) libcholmod.a
+- $(ARCHIVE) libcholmod.a $(OBJ)
+- - $(RANLIB) libcholmod.a
+libcholmod.la: $(OBJ)
+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcholmod.la -rpath
$(libdir) $(OBJ:.o=.lo) -lm \
-+ -lamd -lcolamd -lccolamd -lcamd $(METIS) $(LAPACK) $(BLAS)
++ -lamd -lcolamd $(LIB_WITH_PARTITION) $(LAPACK) $(BLAS)
+
+install: libcholmod.la
+ install -d $(DESTDIR)$(libdir)
@@ -90,267 +104,260 @@
$(OBJ): $(INC)
--I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
-- -I$(METIS_PATH)/Lib -I../../CCOLAMD/Include -I../../CAMD/Include \
-- -I../Include
-+I = -I../Include -I/usr/include/amd -I/usr/include/camd -I/usr/include/colamd
\
-+ -I/usr/include/ccolamd -I$(METIS_PATH)
-
-
#-------------------------------------------------------------------------------
- # Check Module:
+@@ -141,24 +147,24 @@
#-------------------------------------------------------------------------------
cholmod_check.o: ../Check/cholmod_check.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) -c $(I) $<
cholmod_read.o: ../Check/cholmod_read.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) -c $(I) $<
cholmod_write.o: ../Check/cholmod_write.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) -c $(I) $<
#-------------------------------------------------------------------------------
cholmod_l_check.o: ../Check/cholmod_check.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
cholmod_l_read.o: ../Check/cholmod_read.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
cholmod_l_write.o: ../Check/cholmod_write.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $(I) $< -o $@
#-------------------------------------------------------------------------------
-@@ -149,92 +150,92 @@
+@@ -166,92 +172,92 @@
#-------------------------------------------------------------------------------
cholmod_common.o: ../Core/cholmod_common.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_dense.o: ../Core/cholmod_dense.c ../Core/t_cholmod_dense.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_factor.o: ../Core/cholmod_factor.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_change_factor.o: ../Core/cholmod_change_factor.c \
../Core/t_cholmod_change_factor.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_memory.o: ../Core/cholmod_memory.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_sparse.o: ../Core/cholmod_sparse.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_complex.o: ../Core/cholmod_complex.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_transpose.o: ../Core/cholmod_transpose.c ../Core/t_cholmod_transpose.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_band.o: ../Core/cholmod_band.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_copy.o: ../Core/cholmod_copy.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_triplet.o: ../Core/cholmod_triplet.c ../Core/t_cholmod_triplet.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_error.o: ../Core/cholmod_error.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_aat.o: ../Core/cholmod_aat.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_add.o: ../Core/cholmod_add.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
#-------------------------------------------------------------------------------
cholmod_l_common.o: ../Core/cholmod_common.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_dense.o: ../Core/cholmod_dense.c ../Core/t_cholmod_dense.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_factor.o: ../Core/cholmod_factor.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_change_factor.o: ../Core/cholmod_change_factor.c \
../Core/t_cholmod_change_factor.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_memory.o: ../Core/cholmod_memory.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_sparse.o: ../Core/cholmod_sparse.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_complex.o: ../Core/cholmod_complex.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_transpose.o: ../Core/cholmod_transpose.c
../Core/t_cholmod_transpose.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_band.o: ../Core/cholmod_band.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_copy.o: ../Core/cholmod_copy.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_triplet.o: ../Core/cholmod_triplet.c ../Core/t_cholmod_triplet.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_error.o: ../Core/cholmod_error.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_aat.o: ../Core/cholmod_aat.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_add.o: ../Core/cholmod_add.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
#-------------------------------------------------------------------------------
-@@ -242,116 +243,116 @@
+@@ -259,116 +265,116 @@
#-------------------------------------------------------------------------------
cholmod_amd.o: ../Cholesky/cholmod_amd.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_analyze.o: ../Cholesky/cholmod_analyze.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_colamd.o: ../Cholesky/cholmod_colamd.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_etree.o: ../Cholesky/cholmod_etree.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_factorize.o: ../Cholesky/cholmod_factorize.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_postorder.o: ../Cholesky/cholmod_postorder.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_rcond.o: ../Cholesky/cholmod_rcond.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_resymbol.o: ../Cholesky/cholmod_resymbol.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_rowcolcounts.o: ../Cholesky/cholmod_rowcolcounts.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_solve.o: ../Cholesky/cholmod_solve.c ../Cholesky/t_cholmod_lsolve.c \
../Cholesky/t_cholmod_ltsolve.c ../Cholesky/t_cholmod_solve.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_spsolve.o: ../Cholesky/cholmod_spsolve.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_rowfac.o: ../Cholesky/cholmod_rowfac.c ../Cholesky/t_cholmod_rowfac.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
#-------------------------------------------------------------------------------
cholmod_l_amd.o: ../Cholesky/cholmod_amd.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_analyze.o: ../Cholesky/cholmod_analyze.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_colamd.o: ../Cholesky/cholmod_colamd.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_etree.o: ../Cholesky/cholmod_etree.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_factorize.o: ../Cholesky/cholmod_factorize.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_postorder.o: ../Cholesky/cholmod_postorder.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_rcond.o: ../Cholesky/cholmod_rcond.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_resymbol.o: ../Cholesky/cholmod_resymbol.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_rowcolcounts.o: ../Cholesky/cholmod_rowcolcounts.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_solve.o: ../Cholesky/cholmod_solve.c ../Cholesky/t_cholmod_lsolve.c
\
../Cholesky/t_cholmod_ltsolve.c ../Cholesky/t_cholmod_solve.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_spsolve.o: ../Cholesky/cholmod_spsolve.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_rowfac.o: ../Cholesky/cholmod_rowfac.c
../Cholesky/t_cholmod_rowfac.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
#-------------------------------------------------------------------------------
# Partition Module:
@@ -358,126 +365,126 @@
cholmod_ccolamd.o: ../Partition/cholmod_ccolamd.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_csymamd.o: ../Partition/cholmod_csymamd.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_camd.o: ../Partition/cholmod_camd.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_metis.o: ../Partition/cholmod_metis.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_nesdis.o: ../Partition/cholmod_nesdis.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
#-------------------------------------------------------------------------------
cholmod_l_ccolamd.o: ../Partition/cholmod_ccolamd.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_csymamd.o: ../Partition/cholmod_csymamd.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_camd.o: ../Partition/cholmod_camd.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_metis.o: ../Partition/cholmod_metis.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_nesdis.o: ../Partition/cholmod_nesdis.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
#-------------------------------------------------------------------------------
-@@ -359,88 +360,88 @@
+@@ -376,88 +382,88 @@
#-------------------------------------------------------------------------------
cholmod_horzcat.o: ../MatrixOps/cholmod_horzcat.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_norm.o: ../MatrixOps/cholmod_norm.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_scale.o: ../MatrixOps/cholmod_scale.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_drop.o: ../MatrixOps/cholmod_drop.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_sdmult.o: ../MatrixOps/cholmod_sdmult.c \
../MatrixOps/t_cholmod_sdmult.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_ssmult.o: ../MatrixOps/cholmod_ssmult.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_submatrix.o: ../MatrixOps/cholmod_submatrix.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_vertcat.o: ../MatrixOps/cholmod_vertcat.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
cholmod_symmetry.o: ../MatrixOps/cholmod_symmetry.c
- $(C) -c $(I) $<
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CHOLMOD_CONFIG) $(I)
-c $<
++ libtool --tag=CC --mode=compile $(C) $(I) -c $<
#-------------------------------------------------------------------------------
cholmod_l_horzcat.o: ../MatrixOps/cholmod_horzcat.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_norm.o: ../MatrixOps/cholmod_norm.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_scale.o: ../MatrixOps/cholmod_scale.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_drop.o: ../MatrixOps/cholmod_drop.c
- $(C) -DDLONG -c $(I) $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS)
$(CHOLMOD_CONFIG) $(I) -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG $(I) -c $< -o $@
cholmod_l_sdmult.o: ../MatrixOps/cholmod_sdmult.c \
../MatrixOps/t_cholmod_sdmult.c
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CHOLMOD/CHOLMOD-shared.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CHOLMOD/CHOLMOD-ufconfig.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CHOLMOD/CHOLMOD.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
