summaryrefslogtreecommitdiff
path: root/academic/btf
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2019-01-01 17:03:36 -0600
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-01-05 07:49:29 +0700
commit5a995e836e54287e277fe0f027cc2bd4d5633275 (patch)
treef262fec6cb981ba2c4c9a666c8aef5a84e040d89 /academic/btf
parent99207c7929c673aa6321388be2e63b2a1791e06a (diff)
downloadslackbuilds-5a995e836e54287e277fe0f027cc2bd4d5633275.tar.gz
academic/btf: Updated for SuiteSparse 5.4.0.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'academic/btf')
-rw-r--r--academic/btf/btf.SlackBuild6
-rw-r--r--academic/btf/btf.info4
-rw-r--r--academic/btf/patches/autoconfiscate.diff141
3 files changed, 79 insertions, 72 deletions
diff --git a/academic/btf/btf.SlackBuild b/academic/btf/btf.SlackBuild
index fc36773516..1777ae8faf 100644
--- a/academic/btf/btf.SlackBuild
+++ b/academic/btf/btf.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for BTF
-# Copyright 2013-2018 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2013-2019 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,8 +26,8 @@ PRGNAM=btf
SRCNAM=SuiteSparse
SUBDIR=BTF
VERSION=${VERSION:-1.2.6}
-SRCVER=${SRCVER:-5.2.0}
-BUILD=${BUILD:-4}
+SRCVER=${SRCVER:-5.4.0}
+BUILD=${BUILD:-5}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
diff --git a/academic/btf/btf.info b/academic/btf/btf.info
index 231010ddcf..b8d40b92d7 100644
--- a/academic/btf/btf.info
+++ b/academic/btf/btf.info
@@ -1,8 +1,8 @@
PRGNAM="btf"
VERSION="1.2.6"
HOMEPAGE="http://faculty.cse.tamu.edu/davis/suitesparse.html"
-DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.2.0.tar.gz"
-MD5SUM="8e625539dbeed061cc62fbdfed9be7cf"
+DOWNLOAD="http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-5.4.0.tar.gz"
+MD5SUM="4a6d4e74fc44c503f52996ae95cad03a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="suitesparseconfig"
diff --git a/academic/btf/patches/autoconfiscate.diff b/academic/btf/patches/autoconfiscate.diff
index f92190f964..8a621ae66b 100644
--- a/academic/btf/patches/autoconfiscate.diff
+++ b/academic/btf/patches/autoconfiscate.diff
@@ -97,7 +97,7 @@ new file mode 100644
+
+# Checks for library functions.
+
-+PKG_INSTALLDIR
++m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], [${libdir}/pkgconfig])])
+AC_CONFIG_FILES([
+ btf.pc
+ Makefile
@@ -109,7 +109,7 @@ diff --git a/m4/ax_code_coverage.m4 b/m4/ax_code_coverage.m4
new file mode 100644
--- /dev/null
+++ b/m4/ax_code_coverage.m4
-@@ -0,0 +1,264 @@
+@@ -0,0 +1,271 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
+# ===========================================================================
@@ -187,68 +187,48 @@ new file mode 100644
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
-+#serial 24
++#serial 27
+
-+AC_DEFUN([AX_CODE_COVERAGE],[
-+ dnl Check for --enable-code-coverage
-+ AC_REQUIRE([AC_PROG_SED])
++AC_DEFUN([_AX_CODE_COVERAGE_ENABLED],[
++ # check for gcov
++ AC_CHECK_TOOL([GCOV],
++ [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
++ [:])
++ AS_IF([test "X$GCOV" = "X:"],
++ [AC_MSG_ERROR([gcov is needed to do coverage])])
++ AC_SUBST([GCOV])
+
-+ # allow to override gcov location
-+ AC_ARG_WITH([gcov],
-+ [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
-+ [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
-+ [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
++ dnl Check if gcc is being used
++ AS_IF([ test "$GCC" = "no" ], [
++ AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
++ ])
+
-+ AC_MSG_CHECKING([whether to build with code coverage support])
-+ AC_ARG_ENABLE([code-coverage],
-+ AS_HELP_STRING([--enable-code-coverage],
-+ [Whether to enable code coverage support]),,
-+ enable_code_coverage=no)
++ AC_CHECK_PROG([LCOV], [lcov], [lcov])
++ AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
+
-+ AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
-+ AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
-+ AC_MSG_RESULT($enable_code_coverage)
++ AS_IF([ test x"$LCOV" = x ], [
++ AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
++ ])
+
-+ AS_IF([ test "$enable_code_coverage" = "yes" ], [
-+ # check for gcov
-+ AC_CHECK_TOOL([GCOV],
-+ [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
-+ [:])
-+ AS_IF([test "X$GCOV" = "X:"],
-+ [AC_MSG_ERROR([gcov is needed to do coverage])])
-+ AC_SUBST([GCOV])
-+
-+ dnl Check if gcc is being used
-+ AS_IF([ test "$GCC" = "no" ], [
-+ AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
-+ ])
-+
-+ AC_CHECK_PROG([LCOV], [lcov], [lcov])
-+ AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
-+
-+ AS_IF([ test -z "$LCOV" ], [
-+ AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
-+ ])
-+
-+ AS_IF([ test -z "$GENHTML" ], [
-+ AC_MSG_ERROR([Could not find genhtml from the lcov package])
-+ ])
-+
-+ dnl Build the code coverage flags
-+ dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
-+ CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
-+ CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-+ CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-+ CODE_COVERAGE_LIBS="-lgcov"
-+ CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
-+
-+ AC_SUBST([CODE_COVERAGE_CPPFLAGS])
-+ AC_SUBST([CODE_COVERAGE_CFLAGS])
-+ AC_SUBST([CODE_COVERAGE_CXXFLAGS])
-+ AC_SUBST([CODE_COVERAGE_LIBS])
-+ AC_SUBST([CODE_COVERAGE_LDFLAGS])
-+
-+ [CODE_COVERAGE_RULES_CHECK='
++ AS_IF([ test x"$GENHTML" = x ], [
++ AC_MSG_ERROR([Could not find genhtml from the lcov package])
++ ])
++
++ dnl Build the code coverage flags
++ dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
++ CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
++ CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
++ CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
++ CODE_COVERAGE_LIBS="-lgcov"
++ CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
++
++ AC_SUBST([CODE_COVERAGE_CPPFLAGS])
++ AC_SUBST([CODE_COVERAGE_CFLAGS])
++ AC_SUBST([CODE_COVERAGE_CXXFLAGS])
++ AC_SUBST([CODE_COVERAGE_LIBS])
++ AC_SUBST([CODE_COVERAGE_LDFLAGS])
++
++ [CODE_COVERAGE_RULES_CHECK='
+ -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
+ $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
+']
@@ -267,12 +247,39 @@ new file mode 100644
+ -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+ -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
+']
-+ ], [
-+ [CODE_COVERAGE_RULES_CHECK='
++])
++
++AC_DEFUN([_AX_CODE_COVERAGE_DISABLED],[
++ [CODE_COVERAGE_RULES_CHECK='
+ @echo "Need to reconfigure with --enable-code-coverage"
-+']
-+ CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
-+ CODE_COVERAGE_RULES_CLEAN=''
++ ']
++ CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
++ CODE_COVERAGE_RULES_CLEAN=''
++])
++
++AC_DEFUN([AX_CODE_COVERAGE],[
++ dnl Check for --enable-code-coverage
++
++ # allow to override gcov location
++ AC_ARG_WITH([gcov],
++ [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
++ [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
++ [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
++
++ AC_MSG_CHECKING([whether to build with code coverage support])
++ AC_ARG_ENABLE([code-coverage],
++ AS_HELP_STRING([--enable-code-coverage],
++ [Whether to enable code coverage support]),,
++ enable_code_coverage=no)
++
++ AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test "x$enable_code_coverage" = xyes])
++ AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
++ AC_MSG_RESULT($enable_code_coverage)
++
++ AS_IF([ test "x$enable_code_coverage" = xyes ], [
++ _AX_CODE_COVERAGE_ENABLED
++ ], [
++ _AX_CODE_COVERAGE_DISABLED
+ ])
+
+[CODE_COVERAGE_RULES='
@@ -333,6 +340,9 @@ new file mode 100644
+CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
+CODE_COVERAGE_IGNORE_PATTERN ?=
+
++GITIGNOREFILES ?=
++GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
++
+code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
+code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
+code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\
@@ -362,9 +372,6 @@ new file mode 100644
+
+'"$CODE_COVERAGE_RULES_CLEAN"'
+
-+GITIGNOREFILES ?=
-+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-+
+A''M_DISTCHECK_CONFIGURE_FLAGS ?=
+A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-14 11:54:34 +0000