From 0329cc5c9e0d38d047df55615d7ef6fd8ecbe233 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Mon, 6 Nov 2023 22:04:13 -0600 Subject: academic/spqr: Disable tbb integration Compatibility broke somewhere between tbb version 2020u2 and 2021.10.0. Signed-off-by: Kyle Guinn Signed-off-by: Willy Sudiarto Raharjo --- academic/spqr/spqr.SlackBuild | 11 +++-------- academic/spqr/spqr.info | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'academic/spqr') diff --git a/academic/spqr/spqr.SlackBuild b/academic/spqr/spqr.SlackBuild index cb5e08ad55..a99c21b3d7 100644 --- a/academic/spqr/spqr.SlackBuild +++ b/academic/spqr/spqr.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for SPQR -# Copyright 2013-2021 Kyle Guinn +# Copyright 2013-2023 Kyle Guinn # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,7 +29,7 @@ SRCNAM=SuiteSparse SUBDIR=SPQR VERSION=${VERSION:-2.0.9} SRCVER=${SRCVER:-5.8.1} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -58,9 +55,6 @@ DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/gpl.txt" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -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="" @@ -102,6 +96,7 @@ touch Doc/spqr_user_guide.pdf --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-dependency-tracking \ + --without-tbb \ --build=$ARCH-slackware-linux \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/academic/spqr/spqr.info b/academic/spqr/spqr.info index daa36cb95e..560066f756 100644 --- a/academic/spqr/spqr.info +++ b/academic/spqr/spqr.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1/Suit MD5SUM="c414679bbc9432a3def01b31ad921140" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="blas lapack suitesparseconfig cholmod tbb" +REQUIRES="blas lapack suitesparseconfig cholmod" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" -- cgit v1.2.3-65-gdbad