summaryrefslogtreecommitdiff
path: root/libraries/LDL
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2011-06-19 10:32:29 -0400
committerRobby Workman <rworkman@slackbuilds.org>2011-06-19 23:17:05 -0500
commit2158d45842eec382f836f44390cbbe2d7815d0d9 (patch)
tree738a3871774630b4233aa4f4bcc4731094995064 /libraries/LDL
parentdd030eb17685f407cef63f19118b066503f70f44 (diff)
downloadslackbuilds-2158d45842eec382f836f44390cbbe2d7815d0d9.tar.gz
libraries/LDL: Updated for version 2.0.3.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries/LDL')
-rw-r--r--libraries/LDL/LDL.SlackBuild9
-rw-r--r--libraries/LDL/LDL.info6
-rw-r--r--libraries/LDL/autotoolize.diff66
-rw-r--r--libraries/LDL/slack-desc2
4 files changed, 61 insertions, 22 deletions
diff --git a/libraries/LDL/LDL.SlackBuild b/libraries/LDL/LDL.SlackBuild
index 91a78f8df5..8e75606d9c 100644
--- a/libraries/LDL/LDL.SlackBuild
+++ b/libraries/LDL/LDL.SlackBuild
@@ -4,7 +4,7 @@
# Written by Kyle Guinn <elyk03@gmail.com>
PRGNAM=LDL
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.0.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -37,6 +37,9 @@ else
LIBDIRSUFFIX=""
fi
+# Recommended by SuiteSparse
+SLKCFLAGS="$SLKCFLAGS -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+
set -e
rm -rf $PKG
@@ -52,14 +55,16 @@ patch -p1 < $CWD/autotoolize.diff
autoreconf -vif
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
+ --infodir=/usr/info \
--docdir=/usr/doc/$PRGNAM-$VERSION \
+ --enable-shared \
+ --disable-static \
--build=$ARCH-slackware-linux
make
diff --git a/libraries/LDL/LDL.info b/libraries/LDL/LDL.info
index ba30e61672..b3d88093fc 100644
--- a/libraries/LDL/LDL.info
+++ b/libraries/LDL/LDL.info
@@ -1,8 +1,8 @@
PRGNAM="LDL"
-VERSION="2.0.2"
+VERSION="2.0.3"
HOMEPAGE="http://www.cise.ufl.edu/research/sparse/ldl/"
-DOWNLOAD="http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.2.tar.gz"
-MD5SUM="50a0451b5a3ea6fd57edab2fe4253c44"
+DOWNLOAD="http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.3.tar.gz"
+MD5SUM="d55531886f93b6f17fb0c8af97e5d720"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Kyle Guinn"
diff --git a/libraries/LDL/autotoolize.diff b/libraries/LDL/autotoolize.diff
index 280c0ed0a2..455cfacacf 100644
--- a/libraries/LDL/autotoolize.diff
+++ b/libraries/LDL/autotoolize.diff
@@ -2,15 +2,17 @@ diff --git a/Demo/Makefile.am b/Demo/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Demo/Makefile.am
-@@ -0,0 +1,58 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
+@@ -0,0 +1,60 @@
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(AMD_CFLAGS) $(UFCONFIG_CFLAGS)
+LDADD = $(top_builddir)/Source/libldl.la
+
+EXTRA_DIST = \
+ ldlamd.out \
+ ldllamd.out \
+ ldlmain.out \
-+ ldlsimple.out
++ ldllmain.out \
++ ldlsimple.out \
++ ldllsimple.out
+
+# Disable the .out implicit pattern rule. Prevents GNU make from
+# adding bogus dependencies for the .out files listed above.
@@ -26,11 +28,11 @@ new file mode 100644
+
+ldlamd_SOURCES = ldlmain.c
+ldlamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD
-+ldlamd_LDADD = $(LDADD) -lamd
++ldlamd_LDADD = $(LDADD) $(AMD_LIBS)
+
+ldllamd_SOURCES = ldlmain.c
+ldllamd_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_AMD -DLDL_LONG
-+ldllamd_LDADD = $(LDADD) -lamd
++ldllamd_LDADD = $(LDADD) $(AMD_LIBS)
+
+ldlmain_SOURCES = ldlmain.c
+
@@ -79,14 +81,23 @@ new file mode 100644
+
+clean-local:
+ -$(RM) *.aux *.bbl *.blg *.log *.toc
+diff --git a/Include/Makefile.am b/Include/Makefile.am
+new file mode 100644
+--- /dev/null
++++ b/Include/Makefile.am
+@@ -0,0 +1,2 @@
++pkgincludedir = $(includedir)/ldl
++pkginclude_HEADERS = ldl.h
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,3 @@
-+SUBDIRS = Source Matrix Demo Doc
+@@ -0,0 +1,5 @@
++SUBDIRS = Include Source Matrix Demo Doc
+EXTRA_DIST = README.txt
-+include_HEADERS = Include/ldl.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = ldl.pc
diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am
new file mode 100644
--- /dev/null
@@ -101,7 +112,7 @@ new file mode 100644
--- /dev/null
+++ b/Source/Makefile.am
@@ -0,0 +1,16 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
++AM_CPPFLAGS = -I$(top_srcdir)/Include $(UFCONFIG_CFLAGS)
+
+LDLSRC = \
+ ldl.c
@@ -116,14 +127,14 @@ new file mode 100644
+
+libldl_la_SOURCES =
+libldl_la_LIBADD = libldli.la libldll.la
-+libldl_la_LDFLAGS = -no-undefined -version-info 2:2:0
++libldl_la_LDFLAGS = -no-undefined -version-info 2:3:0
diff --git a/configure.ac b/configure.ac
new file mode 100644
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,29 @@
-+AC_PREREQ([2.65])
-+AC_INIT([LDL], [2.0.2], [davis@cise.ufl.edu])
+@@ -0,0 +1,36 @@
++AC_PREREQ([2.68])
++AC_INIT([LDL],[2.0.3],[davis@cise.ufl.edu])
+AC_CONFIG_SRCDIR([Source/ldl.c])
+AC_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([foreign])
@@ -135,19 +146,42 @@ new file mode 100644
+
+LIBS_SAVED=$LIBS
+
-+AC_CHECK_LIB([amd], [amd_order])
-+
+AC_CHECK_HEADERS([stdlib.h])
-+AC_CHECK_HEADERS([UFconfig.h])
++
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([UFCONFIG],[ufconfig],
++ [],
++ [AC_MSG_ERROR([cannot find ufconfig])])
++PKG_CHECK_MODULES([AMD],[amd],
++ [],
++ [AC_MSG_ERROR([cannot find amd])])
+
+AC_FUNC_MALLOC
+
+LIBS=$LIBS_SAVED
+
+AC_CONFIG_FILES([
++ ldl.pc
+ Makefile
+ Demo/Makefile
+ Doc/Makefile
++ Include/Makefile
+ Matrix/Makefile
+ Source/Makefile])
+AC_OUTPUT
+diff --git a/ldl.pc.in b/ldl.pc.in
+new file mode 100644
+--- /dev/null
++++ b/ldl.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: A simple LDL^T factorization
++Version: @PACKAGE_VERSION@
++Requires.private: ufconfig
++Libs: -L${libdir} -lldl
++Cflags: -I${includedir}/ldl
diff --git a/libraries/LDL/slack-desc b/libraries/LDL/slack-desc
index 3e59f00421..6403b7ba1f 100644
--- a/libraries/LDL/slack-desc
+++ b/libraries/LDL/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-LDL: LDL (sparse matrix factorizing routines)
+LDL: LDL (sparse matrix factoring routines)
LDL:
LDL: LDL is a set of concise routines for factorizing symmetric
LDL: positive-definite sparse matrices, with some applicability to