commit cb62827d543f398f01895681fff4e0556d01c0bf
Author: Jakub Bogusz <[email protected]>
Date: Fri Oct 3 19:11:01 2014 +0200
- updated to 2.2.0
- updated ufconfig,shared patches
LDL-shared.patch | 34 +++++++++++++++++-----------------
LDL-ufconfig.patch | 10 +++++++---
LDL.spec | 8 ++++----
3 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/LDL.spec b/LDL.spec
index 0064b4d..14dc58e 100644
--- a/LDL.spec
+++ b/LDL.spec
@@ -1,16 +1,16 @@
Summary: LDL: a simple LDL^T factorization for sparse matrices
Summary(pl.UTF-8): LDL - prosty rozkład LDL^T dla macierzy rzadkich
Name: LDL
-Version: 2.1.0
+Version: 2.2.0
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://www.cise.ufl.edu/research/sparse/ldl/%{name}-%{version}.tar.gz
-# Source0-md5: 654e7b8a45a123b7cab7182dd01a2dc9
+# Source0-md5: 9420881cadb9b55177d7f9a504674f40
Patch0: %{name}-ufconfig.patch
Patch1: %{name}-shared.patch
URL: http://www.cise.ufl.edu/research/sparse/ldl/
-BuildRequires: SuiteSparse_config >= 4.0.0
+BuildRequires: SuiteSparse_config >= 4.3.0
BuildRequires: libtool >= 2:1.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,7 +41,7 @@ Summary: Header files for LDL library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki LDL
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: SuiteSparse_config >= 4.0.0
+Requires: SuiteSparse_config >= 4.3.0
%description devel
Header files for LDL library.
diff --git a/LDL-shared.patch b/LDL-shared.patch
index f04e4c9..e38a743 100644
--- a/LDL-shared.patch
+++ b/LDL-shared.patch
@@ -27,48 +27,48 @@
distclean: purge
---- LDL/Demo/Makefile.orig 2012-01-07 09:58:11.419783839 +0100
-+++ LDL/Demo/Makefile 2012-01-07 11:03:47.723248976 +0100
-@@ -20,34 +20,34 @@
+--- LDL/Demo/Makefile.orig 2014-10-03 18:57:59.452562274 +0200
++++ LDL/Demo/Makefile 2014-10-03 19:01:18.822553908 +0200
+@@ -22,34 +22,34 @@
#-------------------------------------------------------------------------------
ldlmain: ldlmain.c library
-- $(C) ldlmain.c ../Lib/libldl.a -o ldlmain -lm
-+ libtool --tag=CC --mode=link $(C) $(LDFLAGS) ldlmain.c ../Lib/libldl.la
-o ldlmain -lm
+- $(C) ldlmain.c ../Lib/libldl.a -o ldlmain $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) ldlmain.c ../Lib/libldl.la
-o ldlmain $(LIB2)
- ./ldlmain > my_ldlmain.out
- diff ldlmain.out my_ldlmain.out
ldllmain: ldlmain.c library
-- $(C) -DLDL_LONG ldlmain.c ../Lib/libldl.a -o ldllmain -lm
-+ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -DLDL_LONG ldlmain.c
../Lib/libldl.la -o ldllmain -lm
+- $(C) -DLDL_LONG ldlmain.c ../Lib/libldl.a -o ldllmain $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) -DLDL_LONG ldlmain.c
../Lib/libldl.la -o ldllmain $(LIB2)
- ./ldllmain > my_ldllmain.out
- diff ldlmain.out my_ldllmain.out
ldlsimple: ldlsimple.c library
-- $(C) ldlsimple.c ../Lib/libldl.a -o ldlsimple -lm
-+ libtool --tag=CC --mode=link $(C) $(LDFLAGS) ldlsimple.c
../Lib/libldl.la -o ldlsimple -lm
+- $(C) ldlsimple.c ../Lib/libldl.a -o ldlsimple $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) ldlsimple.c
../Lib/libldl.la -o ldlsimple $(LIB2)
- ./ldlsimple > my_ldlsimple.out
- diff ldlsimple.out my_ldlsimple.out
ldllsimple: ldlsimple.c library
-- $(C) $(I) -DLDL_LONG ldlsimple.c ../Lib/libldl.a -o ldllsimple -lm
-+ libtool --tag=CC --mode=link $(C) $(LDFLAGS) $(I) -DLDL_LONG
ldlsimple.c ../Lib/libldl.la -o ldllsimple -lm
+- $(C) $(I) -DLDL_LONG ldlsimple.c ../Lib/libldl.a -o ldllsimple $(LIB2)
++ libtool --tag=CC --mode=link $(C) $(LDFLAGS) $(I) -DLDL_LONG
ldlsimple.c ../Lib/libldl.la -o ldllsimple $(LIB2)
- ./ldllsimple > my_ldllsimple.out
- diff ldlsimple.out my_ldllsimple.out
ldlamd: ldlmain.c library
- - $(C) -I../../AMD/Include -DUSE_AMD \
-- ldlmain.c ../../AMD/Lib/libamd.a ../Lib/libldl.a -o ldlamd -lm
-+ - libtool --tag=CC --mode=link $(C) $(LDFLAGS) -DUSE_AMD \
-+ ldlmain.c -lamd ../Lib/libldl.la -o ldlamd -lm
+- ldlmain.c ../../AMD/Lib/libamd.a ../Lib/libldl.a -o ldlamd
$(LIB2)
++ - libtool --tag=CC --mode=link $(C) $(LDFLAGS) -I/usr/include/amd
-DUSE_AMD \
++ ldlmain.c -lamd ../Lib/libldl.la -o ldlamd $(LIB2)
- ./ldlamd > my_ldlamd.out
- diff ldlamd.out my_ldlamd.out
ldllamd: ldlmain.c library
- - $(C) -DLDL_LONG $(I) -I../../AMD/Include -DUSE_AMD \
-- ldlmain.c ../../AMD/Lib/libamd.a ../Lib/libldl.a -o ldllamd -lm
-+ - libtool --tag=CC --mode=link $(C) $(LDFLAGS) -DLDL_LONG $(I)
-DUSE_AMD \
-+ ldlmain.c -lamd ../Lib/libldl.la -o ldllamd -lm
+- ldlmain.c ../../AMD/Lib/libamd.a ../Lib/libldl.a -o ldllamd
$(LIB2)
++ - libtool --tag=CC --mode=link $(C) $(LDFLAGS) -DLDL_LONG $(I)
-I/usr/include/amd -DUSE_AMD \
++ ldlmain.c -lamd ../Lib/libldl.la -o ldllamd $(LIB2)
- ./ldllamd > my_ldllamd.out
- diff ldllamd.out my_ldllamd.out
diff --git a/LDL-ufconfig.patch b/LDL-ufconfig.patch
index c9a823d..ff2546e 100644
--- a/LDL-ufconfig.patch
+++ b/LDL-ufconfig.patch
@@ -23,9 +23,9 @@
C = $(CC) $(CF) $(I)
---- LDL/Demo/Makefile.orig 2011-12-08 17:27:58.000000000 +0100
-+++ LDL/Demo/Makefile 2012-01-06 13:09:16.100608063 +0100
-@@ -4,16 +4,15 @@
+--- LDL/Demo/Makefile.orig 2014-10-03 17:03:06.916184859 +0200
++++ LDL/Demo/Makefile 2014-10-03 18:57:36.315896575 +0200
+@@ -4,19 +4,17 @@
default: all
@@ -39,7 +39,11 @@
all: ldlsimple ldllsimple ldlmain ldllmain ldlamd ldllamd
+-LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB)
++LIB2 = -lsuitesparseconfig $(LIB)
+
library:
+- ( cd ../../SuiteSparse_config ; $(MAKE) library )
- ( cd ../../AMD ; $(MAKE) library )
( cd ../Lib ; $(MAKE) )
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/LDL.git/commitdiff/cb62827d543f398f01895681fff4e0556d01c0bf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
