git: 2ea6b0040121 - main - Mk/Uses/blaslapack.mk: respect DEFAULT_VERSIONS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 24 Jan 2025 16:42:41 UTC
The branch main has been updated by thierry:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2ea6b0040121605ffccc4711d214ca0826dae2f6
commit 2ea6b0040121605ffccc4711d214ca0826dae2f6
Author: Mikhail Teterin <mi@FreeBSD.org>
AuthorDate: 2025-01-24 13:36:17 +0000
Commit: Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2025-01-24 16:42:00 +0000
Mk/Uses/blaslapack.mk: respect DEFAULT_VERSIONS
Remark: BLASLAPACK_DEFAULT is not included in Mk/bsd.default-versions.mk,
and some ports may fail with a different implementation.
PR: 283298
Reported by: Mikhail T.
---
Mk/Uses/blaslapack.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk
index 10f0c0a3166d..1e602695b0a0 100644
--- a/Mk/Uses/blaslapack.mk
+++ b/Mk/Uses/blaslapack.mk
@@ -15,10 +15,8 @@ _INCLUDE_USES_BLASLAPACK_MK= yes
_valid_ARGS= atlas blis flexiblas netlib openblas openblas64
-_DEFAULT_BLASLAPACK= netlib
-
. if empty(blaslapack_ARGS)
-blaslapack_ARGS= ${_DEFAULT_BLASLAPACK}
+blaslapack_ARGS= ${BLASLAPACK_DEFAULT}
. endif
LDFLAGS+= -L${LOCALBASE}/lib
@@ -40,7 +38,7 @@ BLA_VENDOR= FLAME
LIB_DEPENDS+= libflexiblas.so:math/flexiblas
_BLASLIB= flexiblas
BLA_VENDOR= FlexiBLAS
-. elif ${blaslapack_ARGS} == netlib
+. elif ${blaslapack_ARGS} == netlib || empty(blaslapack_ARGS)
LIB_DEPENDS+= libblas.so:math/blas
LIB_DEPENDS+= liblapack.so:math/lapack
_BLASLIB= blas