git: 390e0ec2f981 - main - */*: chase the removal of math/gotoblas
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 29 Oct 2023 10:48:58 UTC
The branch main has been updated by thierry:
URL: https://cgit.FreeBSD.org/ports/commit/?id=390e0ec2f9817bdec41597ed8daf0da02f092272
commit 390e0ec2f9817bdec41597ed8daf0da02f092272
Author: Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-10-29 10:46:49 +0000
Commit: Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2023-10-29 10:48:40 +0000
*/*: chase the removal of math/gotoblas
Thanks to yuri@ the latest consumers have been fixed.
PR: 274110
Reported by: Ivan Rozhuk
---
Mk/Uses/blaslapack.mk | 10 ++--------
math/suitesparse/bsd.suitesparse.mk | 4 +---
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk
index fece76dbc93d..0d3007ec5907 100644
--- a/Mk/Uses/blaslapack.mk
+++ b/Mk/Uses/blaslapack.mk
@@ -2,7 +2,7 @@
#
# Feature: blaslapack
# Usage: USES=blaslapack or USES=blaslapack:ARGS
-# Valid ARGS: atlas gotoblas netlib (default) openblas
+# Valid ARGS: atlas netlib (default) openblas
#
# Provides: BLASLIB and LAPACKLIB
#
@@ -11,7 +11,7 @@
.if !defined(_INCLUDE_USES_BLASLAPACK_MK)
_INCLUDE_USES_BLASLAPACK_MK= yes
-_valid_ARGS= atlas gotoblas netlib openblas
+_valid_ARGS= atlas netlib openblas
_DEFAULT_BLASLAPACK= netlib
@@ -28,12 +28,6 @@ LAPACKLIB= -lalapack -lptcblas
_ATLASLIB= atlas
ATLASLIB= -l${_ATLASLIB}
BLA_VENDOR= ATLAS
-. elif ${blaslapack_ARGS} == gotoblas
-LIB_DEPENDS+= libgoto2.so:math/gotoblas
-LIB_DEPENDS+= liblapack.so:math/lapack
-_BLASLIB= goto2p
-LAPACKLIB= -lgoto2p
-BLA_VENDOR= Goto
. elif ${blaslapack_ARGS} == netlib
LIB_DEPENDS+= libblas.so:math/blas
LIB_DEPENDS+= liblapack.so:math/lapack
diff --git a/math/suitesparse/bsd.suitesparse.mk b/math/suitesparse/bsd.suitesparse.mk
index 925e8ef86d0e..3d59ba3e82d8 100644
--- a/math/suitesparse/bsd.suitesparse.mk
+++ b/math/suitesparse/bsd.suitesparse.mk
@@ -64,12 +64,10 @@ OPTIONS_DEFAULT+= OPTIMIZED_CFLAGS
${MPORTNAME} == SPQR || \
${MPORTNAME} == UMFPACK
OPTIONS_RADIO+= BLAS
-OPTIONS_RADIO_BLAS+= ATLAS GOTOBLAS NETLIB OPENBLAS
+OPTIONS_RADIO_BLAS+= ATLAS NETLIB OPENBLAS
OPTIONS_DEFAULT+= OPENBLAS
ATLAS_USES= blaslapack:atlas
-GOTOBLAS_DESC= Goto blas implementation
-GOTOBLAS_USES= blaslapack:gotoblas
NETLIB_USES= blaslapack:netlib
OPENBLAS_USES= blaslapack:openblas
.endif