aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/cholmod/autotoolize.diff8
-rw-r--r--academic/cholmod/cholmod.SlackBuild8
-rw-r--r--academic/cholmod/cholmod.info6
3 files changed, 12 insertions, 10 deletions
diff --git a/academic/cholmod/autotoolize.diff b/academic/cholmod/autotoolize.diff
index 8c87d18771f5..e25303da8732 100644
--- a/academic/cholmod/autotoolize.diff
+++ b/academic/cholmod/autotoolize.diff
@@ -193,7 +193,7 @@ diff --git a/Doc/Makefile.am b/Doc/Makefile.am
new file mode 100644
--- /dev/null
+++ b/Doc/Makefile.am
-@@ -0,0 +1,436 @@
+@@ -0,0 +1,437 @@
+EXTRA_DIST = \
+ ChangeLog
+
@@ -252,6 +252,7 @@ new file mode 100644
+ _ldlsolve_m.tex \
+ _ldlsplit_m.tex \
+ _ldlupdate_m.tex \
++ _ldlrowmod_m.tex \
+ _metis_m.tex \
+ _mread_m.tex \
+ _mwrite_m.tex \
@@ -760,7 +761,7 @@ diff --git a/MATLAB/Makefile.am b/MATLAB/Makefile.am
new file mode 100644
--- /dev/null
+++ b/MATLAB/Makefile.am
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
+# Needed by Doc/Makefile.am
+EXTRA_DIST = \
+ analyze.m \
@@ -777,6 +778,7 @@ new file mode 100644
+ ldlsolve.m \
+ ldlsplit.m \
+ ldlupdate.m \
++ ldlrowmod.m \
+ metis.m \
+ mread.m \
+ mwrite.m \
@@ -1446,7 +1448,7 @@ new file mode 100644
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
-+AC_INIT([CHOLMOD],[3.0.5],[DrTimothyAldenDavis@gmail.com],[cholmod],[http://www.suitesparse.com/])
++AC_INIT([CHOLMOD],[3.0.6],[DrTimothyAldenDavis@gmail.com],[cholmod],[http://www.suitesparse.com/])
+AC_CONFIG_SRCDIR([Core/cholmod_common.c])
+AC_CONFIG_HEADERS([config.h Include/cholmod_config.h])
+AM_INIT_AUTOMAKE([foreign])
diff --git a/academic/cholmod/cholmod.SlackBuild b/academic/cholmod/cholmod.SlackBuild
index 24dcc2ecac4b..9b04c77c052e 100644
--- a/academic/cholmod/cholmod.SlackBuild
+++ b/academic/cholmod/cholmod.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for CHOLMOD
-# Copyright 2013-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2016 Kyle Guinn <elyk03@gmail.com>, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
PRGNAM=cholmod
SRCNAM=SuiteSparse
SUBDIR=CHOLMOD
-VERSION=${VERSION:-3.0.5}
-SRCVER=${SRCVER:-4.4.4}
+VERSION=${VERSION:-3.0.6}
+SRCVER=${SRCVER:-4.4.6}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -69,7 +69,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $SRCNAM
-tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz $SRCNAM/$SUBDIR
cd $SRCNAM/$SUBDIR
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
diff --git a/academic/cholmod/cholmod.info b/academic/cholmod/cholmod.info
index b998ea9b3491..6c6c72a93aba 100644
--- a/academic/cholmod/cholmod.info
+++ b/academic/cholmod/cholmod.info
@@ -1,8 +1,8 @@
PRGNAM="cholmod"
-VERSION="3.0.5"
+VERSION="3.0.6"
HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz"
-MD5SUM="e0af74476935c9ff6d971df8bb6b82fc"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.6.tar.gz"
+MD5SUM="131a3a5e2dee784cd946284e44ce9af2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="blas lapack suitesparseconfig amd camd colamd ccolamd"