summaryrefslogtreecommitdiff
path: root/academic/klu
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2016-11-19 14:51:44 -0600
committerDavid Spencer <idlemoor@slackbuilds.org>2016-12-04 19:28:56 +0000
commit36c393d6dd1e22e1cc2d32afc03d5b39c00f5ae1 (patch)
treefb7f2984833cb6ee7eb639937d7d26fbfe7cd2de /academic/klu
parent5d13a1088d61a8d7d6e2a8fa427aab4d4a19fb87 (diff)
downloadslackbuilds-36c393d6dd1e22e1cc2d32afc03d5b39c00f5ae1.tar.gz
academic/klu: Updated for version 1.3.8.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'academic/klu')
-rw-r--r--academic/klu/klu.SlackBuild20
-rw-r--r--academic/klu/klu.info6
-rw-r--r--academic/klu/patches/autotoolize.diff (renamed from academic/klu/autotoolize.diff)52
3 files changed, 39 insertions, 39 deletions
diff --git a/academic/klu/klu.SlackBuild b/academic/klu/klu.SlackBuild
index 28b2092bbb..b1a6464d11 100644
--- a/academic/klu/klu.SlackBuild
+++ b/academic/klu/klu.SlackBuild
@@ -25,14 +25,14 @@
PRGNAM=klu
SRCNAM=SuiteSparse
SUBDIR=KLU
-VERSION=${VERSION:-1.3.3}
-SRCVER=${SRCVER:-4.4.6}
+VERSION=${VERSION:-1.3.8}
+SRCVER=${SRCVER:-4.5.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$(uname -m) ;;
esac
@@ -43,11 +43,14 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="README.txt Doc/ChangeLog Doc/lesser.txt"
+DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/lesser.txt"
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
@@ -73,10 +76,12 @@ cd $SRCNAM/$SUBDIR
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
-patch -p1 < $CWD/autotoolize.diff
+patch -p1 < $CWD/patches/autotoolize.diff
autoreconf -vif
-CFLAGS="$SLKCFLAGS" \
+# Avoid rebuilding the docs.
+touch Doc/KLU_UserGuide.pdf
+
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -88,7 +93,8 @@ CFLAGS="$SLKCFLAGS" \
--enable-shared \
--disable-static \
--disable-dependency-tracking \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux \
+ CFLAGS="$SLKCFLAGS" \
make
make check
diff --git a/academic/klu/klu.info b/academic/klu/klu.info
index 617b8ccc97..104cb556ce 100644
--- a/academic/klu/klu.info
+++ b/academic/klu/klu.info
@@ -1,8 +1,8 @@
PRGNAM="klu"
-VERSION="1.3.3"
+VERSION="1.3.8"
HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
-MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.3.tar.gz"
+MD5SUM="8ec57324585df3c6483ad7f556afccbd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="suitesparseconfig amd colamd btf"
diff --git a/academic/klu/autotoolize.diff b/academic/klu/patches/autotoolize.diff
index b664f48fb8..423e84572c 100644
--- a/academic/klu/autotoolize.diff
+++ b/academic/klu/patches/autotoolize.diff
@@ -53,8 +53,11 @@ diff --git a/Doc/Makefile.am b/Doc/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Doc/Makefile.am
-@@ -0,0 +1,48 @@
-+EXTRA_DIST = ChangeLog lesser.txt
+@@ -0,0 +1,51 @@
++EXTRA_DIST = \
++ ChangeLog \
++ License.txt \
++ lesser.txt
+
+dist_noinst_DATA = KLU_UserGuide.tex KLU_UserGuide.bib
+dist_pdf_DATA = KLU_UserGuide.pdf palamadai_e.pdf
@@ -112,11 +115,10 @@ diff --git a/Makefile.am b/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Makefile.am
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,4 @@
+SUBDIRS = Include Source User Matrix Demo Doc
+EXTRA_DIST = README.txt
+
-+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = klu.pc
diff --git a/Matrix/Makefile.am b/Matrix/Makefile.am
new file mode 100644
@@ -200,45 +202,35 @@ diff --git a/configure.ac b/configure.ac
new file mode 100644
--- /dev/null
+++ b/configure.ac
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,54 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
-+AC_INIT([KLU],[1.3.3],[DrTimothyAldenDavis@gmail.com],[klu],[http://www.suitesparse.com/])
++AC_INIT([KLU],[1.3.8],[DrTimothyAldenDavis@gmail.com],[klu],[http://www.suitesparse.com/])
+AC_CONFIG_SRCDIR([Source/klu.c])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign])
+LT_INIT
+
+# Checks for programs.
++PKG_PROG_PKG_CONFIG
+AC_PROG_INSTALL
+AC_PROG_CC
+
-+LIBS_SAVED=$LIBS
++AS_VAR_SET([LIBS_SAVED], [$LIBS])
+
+# Checks for libraries.
+AC_CHECK_LIB([m], [sqrt])
+
-+PKG_PROG_PKG_CONFIG
-+PKG_CHECK_MODULES([SUITESPARSECONFIG],[suitesparseconfig],
-+ [],
-+ [AC_MSG_ERROR([cannot find suitesparseconfig])])
-+PKG_CHECK_MODULES([AMD],[amd],
-+ [],
-+ [AC_MSG_ERROR([cannot find amd])])
-+PKG_CHECK_MODULES([COLAMD],[colamd],
-+ [],
-+ [AC_MSG_ERROR([cannot find colamd])])
-+PKG_CHECK_MODULES([BTF],[btf],
-+ [],
-+ [AC_MSG_ERROR([cannot find btf])])
-+PKG_CHECK_MODULES([CHOLMOD],[cholmod],
-+ [cholmod="yes"],
-+ [cholmod="no"])
-+if test "x$cholmod" != "xyes"; then
-+ AC_MSG_WARN([cannot find cholmod, disabling some functionality])
-+fi
++PKG_CHECK_MODULES([SUITESPARSECONFIG], [suitesparseconfig])
++PKG_CHECK_MODULES([AMD], [amd])
++PKG_CHECK_MODULES([COLAMD], [colamd])
++PKG_CHECK_MODULES([BTF], [btf])
++PKG_CHECK_MODULES([CHOLMOD], [cholmod],
++ [AS_VAR_SET([have_cholmod], [yes])],
++ [AS_VAR_SET([have_cholmod], [no])
++ AC_MSG_WARN([$CHOLMOD_PKG_ERRORS, disabling some functionality])])
+
+# Checks for header files.
+AC_CHECK_HEADERS([limits.h stdlib.h])
@@ -249,10 +241,11 @@ new file mode 100644
+# Checks for library functions.
+AC_CHECK_FUNCS([sqrt])
+
-+LIBS=$LIBS_SAVED
++AS_VAR_SET([LIBS], [$LIBS_SAVED])
+
-+AM_CONDITIONAL([CHOLMOD], [test "x$cholmod" = "xyes"])
++AM_CONDITIONAL([CHOLMOD], [test "x$have_cholmod" = "xyes"])
+
++PKG_INSTALLDIR
+AC_CONFIG_FILES([
+ klu.pc
+ Makefile
@@ -261,7 +254,8 @@ new file mode 100644
+ Include/Makefile
+ Matrix/Makefile
+ Source/Makefile
-+ User/Makefile])
++ User/Makefile
++])
+AC_OUTPUT
diff --git a/klu.pc.in b/klu.pc.in
new file mode 100644