academic/cholmod: Updated for version 3.0.14.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 14 deletions

diff --git a/academic/cholmod/cholmod.SlackBuild b/academic/cholmod/cholmod.SlackBuild
index aae466f09872..5ac8ce8cf7ce 100644
--- a/academic/cholmod/cholmod.SlackBuild
+++ b/academic/cholmod/cholmod.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for CHOLMOD
 
-# Copyright 2013-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2021 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,9 +25,9 @@
 PRGNAM=cholmod
 SRCNAM=SuiteSparse
 SUBDIR=CHOLMOD
-VERSION=${VERSION:-3.0.13}
-SRCVER=${SRCVER:-5.6.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.14}
+SRCVER=${SRCVER:-5.8.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
diff --git a/academic/cholmod/cholmod.info b/academic/cholmod/cholmod.info
index 9b41a522e898..ddaabdec000a 100644
--- a/academic/cholmod/cholmod.info
+++ b/academic/cholmod/cholmod.info
@@ -1,8 +1,8 @@
 PRGNAM="cholmod"
-VERSION="3.0.13"
+VERSION="3.0.14"
 HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.6.0/SuiteSparse-5.6.0.tar.gz"
-MD5SUM="af8b97cbded4cd5c6672e878bc0c37c2"
+DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/SuiteSparse-5.8.1.tar.gz"
+MD5SUM="c414679bbc9432a3def01b31ad921140"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="blas lapack suitesparseconfig amd camd colamd ccolamd"
diff --git a/academic/cholmod/patches/autoconfiscate.diff b/academic/cholmod/patches/autoconfiscate.diff
index 6cdb2b7b6a0a..36736536c459 100644
--- a/academic/cholmod/patches/autoconfiscate.diff
+++ b/academic/cholmod/patches/autoconfiscate.diff
@@ -1469,7 +1469,7 @@ new file mode 100644
 +# Process this file with autoconf to produce a configure script.
 +
 +AC_PREREQ([2.69])
-+AC_INIT([CHOLMOD],[3.0.13],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[cholmod],[http://www.suitesparse.com/])
++AC_INIT([CHOLMOD],[3.0.14],[https://github.com/DrTimothyAldenDavis/SuiteSparse],[cholmod],[http://www.suitesparse.com/])
 +AC_CONFIG_SRCDIR([Core/cholmod_common.c])
 +AC_CONFIG_AUX_DIR([build-aux])
 +AC_CONFIG_MACRO_DIR([m4])
@@ -1690,7 +1690,7 @@ diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_blas.m4
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,241 @@
 +# ===========================================================================
 +#         https://www.gnu.org/software/autoconf-archive/ax_blas.html
 +# ===========================================================================
@@ -1729,6 +1729,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -1756,7 +1757,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 16
++#serial 17
 +
 +AU_ALIAS([ACX_BLAS], [AX_BLAS])
 +AC_DEFUN([AX_BLAS], [
@@ -1770,7 +1771,9 @@ new file mode 100644
 +case $with_blas in
 +	yes | "") ;;
 +	no) ax_blas_ok=disable ;;
-+	-* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;;
++	-* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++		BLAS_LIBS="$with_blas"
++	;;
 +	*) BLAS_LIBS="-l$with_blas" ;;
 +esac
 +
@@ -2209,7 +2212,7 @@ diff --git a/m4/ax_lapack.m4 b/m4/ax_lapack.m4
 new file mode 100644
 --- /dev/null
 +++ b/m4/ax_lapack.m4
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,134 @@
 +# ===========================================================================
 +#        https://www.gnu.org/software/autoconf-archive/ax_lapack.html
 +# ===========================================================================
@@ -2249,6 +2252,7 @@ new file mode 100644
 +# LICENSE
 +#
 +#   Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2019 Geoffrey M. Oxberry <goxberry@gmail.com>
 +#
 +#   This program is free software: you can redistribute it and/or modify it
 +#   under the terms of the GNU General Public License as published by the
@@ -2276,7 +2280,7 @@ new file mode 100644
 +#   modified version of the Autoconf Macro, you may extend this special
 +#   exception to the GPL to apply to your modified version as well.
 +
-+#serial 9
++#serial 10
 +
 +AU_ALIAS([ACX_LAPACK], [AX_LAPACK])
 +AC_DEFUN([AX_LAPACK], [
@@ -2288,7 +2292,9 @@ new file mode 100644
 +case $with_lapack in
 +        yes | "") ;;
 +        no) ax_lapack_ok=disable ;;
-+        -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;;
++        -* | */* | *.a | *.so | *.so.* | *.dylib | *.dylib.* | *.o)
++                 LAPACK_LIBS="$with_lapack"
++        ;;
 +        *) LAPACK_LIBS="-l$with_lapack" ;;
 +esac
 +