From 1a10bdc3f54a859cc479c6beb2b635b2353276bc Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sat, 2 Jan 2021 18:13:12 -0600 Subject: academic/umfpack: Updated for SuiteSparse 5.8.1. Signed-off-by: Kyle Guinn Signed-off-by: Willy Sudiarto Raharjo --- academic/umfpack/patches/autoconfiscate.diff | 9 ++++++--- academic/umfpack/umfpack.SlackBuild | 6 +++--- academic/umfpack/umfpack.info | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/academic/umfpack/patches/autoconfiscate.diff b/academic/umfpack/patches/autoconfiscate.diff index b902c15281..de66ade417 100644 --- a/academic/umfpack/patches/autoconfiscate.diff +++ b/academic/umfpack/patches/autoconfiscate.diff @@ -866,7 +866,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 +# =========================================================================== @@ -905,6 +905,7 @@ new file mode 100644 +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson ++# Copyright (c) 2019 Geoffrey M. Oxberry +# +# 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 @@ -932,7 +933,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], [ @@ -946,7 +947,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 + diff --git a/academic/umfpack/umfpack.SlackBuild b/academic/umfpack/umfpack.SlackBuild index c87f06711a..046a2501b6 100644 --- a/academic/umfpack/umfpack.SlackBuild +++ b/academic/umfpack/umfpack.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for UMFPACK -# Copyright 2013-2020 Kyle Guinn +# Copyright 2013-2021 Kyle Guinn # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,8 +26,8 @@ PRGNAM=umfpack SRCNAM=SuiteSparse SUBDIR=UMFPACK VERSION=${VERSION:-5.7.9} -SRCVER=${SRCVER:-5.6.0} -BUILD=${BUILD:-1} +SRCVER=${SRCVER:-5.8.1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/academic/umfpack/umfpack.info b/academic/umfpack/umfpack.info index 283dfdc4cb..9b8e8496a8 100644 --- a/academic/umfpack/umfpack.info +++ b/academic/umfpack/umfpack.info @@ -1,8 +1,8 @@ PRGNAM="umfpack" VERSION="5.7.9" 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 suitesparseconfig amd cholmod" -- cgit v1.2.3