Skip to content

Commit

Permalink
*/*: chase the removal of math/gotoblas
Browse files Browse the repository at this point in the history
Thanks to yuri@ the latest consumers have been fixed.

PR:		274110
Reported by:	Ivan Rozhuk
  • Loading branch information
thierry-FreeBSD committed Oct 29, 2023
1 parent 3018b7a commit 390e0ec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
10 changes: 2 additions & 8 deletions Mk/Uses/blaslapack.mk
Expand Up @@ -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
#
Expand All @@ -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

Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions math/suitesparse/bsd.suitesparse.mk
Expand Up @@ -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
Expand Down

0 comments on commit 390e0ec

Please sign in to comment.