Author: qboosh Date: Sun Jan 1 12:41:15 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.2.3 - updated ufconfig,shared patches
---- Files affected: packages/AMD: AMD.spec (1.17 -> 1.18) , amd-shared.patch (1.4 -> 1.5) , amd-ufconfig.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/AMD/AMD.spec diff -u packages/AMD/AMD.spec:1.17 packages/AMD/AMD.spec:1.18 --- packages/AMD/AMD.spec:1.17 Thu Jan 27 19:42:33 2011 +++ packages/AMD/AMD.spec Sun Jan 1 13:41:09 2012 @@ -2,12 +2,12 @@ Summary: AMD: Approximate Minimum Degree Summary(pl.UTF-8): AMD - przybliżony algorytm minimalnego stopnia Name: AMD -Version: 2.2.2 +Version: 2.2.3 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: http://www.cise.ufl.edu/research/sparse/amd/%{name}-%{version}.tar.gz -# Source0-md5: 76b870aaf5c98eb34579467dfed38b19 +# Source0-md5: 4d2a7db82406f880e7686fbd2df5a3bf Patch0: amd-ufconfig.patch Patch1: amd-shared.patch URL: http://www.cise.ufl.edu/research/sparse/amd/ @@ -105,6 +105,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2012/01/01 12:41:09 qboosh +- updated to 2.2.3 +- updated ufconfig,shared patches + Revision 1.17 2011/01/27 18:42:33 qboosh - updated to 2.2.2 ================================================================ Index: packages/AMD/amd-shared.patch diff -u packages/AMD/amd-shared.patch:1.4 packages/AMD/amd-shared.patch:1.5 --- packages/AMD/amd-shared.patch:1.4 Wed Oct 13 09:00:03 2010 +++ packages/AMD/amd-shared.patch Sun Jan 1 13:41:09 2012 @@ -57,8 +57,8 @@ ./amd_f77cross > my_amd_f77cross.out - diff amd_f77cross.out my_amd_f77cross.out ---- AMD/Lib/GNUmakefile.orig 2010-10-13 08:48:16.000000000 +0200 -+++ AMD/Lib/GNUmakefile 2010-10-13 08:54:35.527741882 +0200 +--- AMD/Lib/GNUmakefile.orig 2012-01-01 12:11:28.552693675 +0100 ++++ AMD/Lib/GNUmakefile 2012-01-01 12:15:13.479367873 +0100 @@ -2,7 +2,7 @@ # AMD Makefile for compiling on Unix systems (for GNU make only) #------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ #------------------------------------------------------------------------------- -libamd.a: amd_global.o $(AMDI) $(AMDL) -- $(AR) libamd.a $^ +- $(ARCHIVE) libamd.a $^ - - $(RANLIB) libamd.a +libamd.la: amd_global.o $(AMDI) $(AMDL) + libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $(^:.o=.lo) -lm @@ -115,7 +115,7 @@ + libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o -libamdf77.a: $(AMDF77) -- $(AR) libamdf77.a $^ +- $(ARCHIVE) libamdf77.a $^ - - $(RANLIB) libamdf77.a +libamdf77.la: $(AMDF77) + libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $(^:.o=.lo) -lm ================================================================ Index: packages/AMD/amd-ufconfig.patch diff -u packages/AMD/amd-ufconfig.patch:1.1 packages/AMD/amd-ufconfig.patch:1.2 --- packages/AMD/amd-ufconfig.patch:1.1 Sun Dec 2 19:15:14 2007 +++ packages/AMD/amd-ufconfig.patch Sun Jan 1 13:41:09 2012 @@ -10,9 +10,8 @@ int main (void) { -diff -ur AMD/Demo/Makefile AMD-uf/Demo/Makefile ---- AMD/Demo/Makefile 2007-05-05 16:25:26.000000000 +0200 -+++ AMD-uf/Demo/Makefile 2007-12-02 18:01:51.000000000 +0100 +--- AMD/Demo/Makefile.orig 2011-12-08 17:09:28.000000000 +0100 ++++ AMD/Demo/Makefile 2012-01-01 12:05:32.912681767 +0100 @@ -4,11 +4,11 @@ default: amd_simple amd_demo amd_demo2 amd_l_demo @@ -20,8 +19,8 @@ -include ../../UFconfig/UFconfig.mk +include /usr/share/misc/UFconfig.mk --C = $(CC) $(CFLAGS) -I../Include -I../../UFconfig -+C = $(CC) $(CFLAGS) -I../Include +-C = $(CC) $(CF) -I../Include -I../../UFconfig ++C = $(CC) $(CF) -I../Include -INC = ../Include/amd.h ../../UFconfig/UFconfig.h +INC = ../Include/amd.h @@ -64,9 +63,8 @@ #if defined (DLONG) || defined (ZLONG) -diff -ur AMD/Lib/Makefile AMD-uf/Lib/Makefile ---- AMD/Lib/Makefile 2007-05-06 14:32:40.000000000 +0200 -+++ AMD-uf/Lib/Makefile 2007-12-02 18:02:11.000000000 +0100 +--- AMD/Lib/Makefile.orig 2011-12-08 18:36:01.000000000 +0100 ++++ AMD/Lib/Makefile 2012-01-01 12:08:08.002686960 +0100 @@ -8,9 +8,9 @@ default: everything @@ -74,8 +72,8 @@ -include ../../UFconfig/UFconfig.mk +include /usr/share/misc/UFconfig.mk --C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig -+C = $(CC) $(CFLAGS) $(CONFIG) -I../Include +-C = $(CC) $(CF) -I../Include -I../../UFconfig ++C = $(CC) $(CF) -I../Include everything: $(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o @@ -123,21 +121,21 @@ SRC = ../Source/amd_1.c ../Source/amd_2.c ../Source/amd_aat.c \ ../Source/amd_control.c ../Source/amd_defaults.c ../Source/amd_dump.c \ ---- AMD/Lib/GNUmakefile~ 2007-05-06 14:32:19.000000000 +0200 -+++ AMD/Lib/GNUmakefile 2007-12-02 18:23:35.000000000 +0100 +--- AMD/Lib/GNUmakefile.orig 2011-12-08 18:35:33.000000000 +0100 ++++ AMD/Lib/GNUmakefile 2012-01-01 12:07:45.906019555 +0100 @@ -4,9 +4,9 @@ - default: ../Lib/libamd.a + default: libamd.a -include ../../UFconfig/UFconfig.mk +include /usr/share/misc/UFconfig.mk --C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig -+C = $(CC) $(CFLAGS) $(CONFIG) -I../Include +-C = $(CC) $(CF) -I../Include -I../../UFconfig ++C = $(CC) $(CF) -I../Include #------------------------------------------------------------------------------- # source files -@@ -15,9 +15,7 @@ +@@ -15,9 +15,7 @@ C = $(CC) $(CF) -I../Include -I../../UFc AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \ amd_order amd_control amd_info amd_valid amd_preprocess ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/AMD/AMD.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/AMD/amd-shared.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/AMD/amd-ufconfig.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
