commit: 0a6b1fa316f48d2dba51fe813963d1fa8d057c0a Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Thu Dec 25 15:20:30 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Thu Dec 25 15:45:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6b1fa3
sci-libs/blas-lapack-aux-wrapper: fix forcing netlib for tests FLEXIBLAS=trigger-warning doesn't work because the fallback isn't netlib, it is "what would have been used if the variable is unset". Explicitly set netlib. Getting log info regarding flexiblas being used can be done by setting FLEXIBLAS_VERBOSE. It is much more chatty, far more than one line gets into the logfile, but that's okay. Fixes tests on arm, where openblas (the USE default of flexiblas!) seems to just not work as expected. This should not be allowed to affect the testsuite for blas-lapack-aux-wrapper, which is testing if the wrapper works, not if openblas does. Bug: https://bugs.gentoo.org/967928 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-1.ebuild | 7 ++++--- sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-4.ebuild | 7 ++++--- sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-6.ebuild | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-1.ebuild b/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-1.ebuild index 031b61c2a662..3c4887c69398 100644 --- a/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-1.ebuild +++ b/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-1.ebuild @@ -55,7 +55,7 @@ src_configure() { check_result() { local f=${1} - if ! grep -q "flexiblas.*TRIGGER-WARNING" "${f}.out"; then + if ! grep -q "<flexiblas> Check if shared library exist" "${f}.out"; then die "No FlexiBLAS output found in ${f}.out" fi if grep -q -i "FAIL" "${f}.out"; then @@ -72,10 +72,11 @@ run_test() { } src_test() { - # Force a nonexisting provider to: # a. get indication that FlexiBLAS is actually used on stderr. + local -x FLEXIBLAS_VERBOSE=1 # b. force fallback to Netlib LAPACK. - local -x FLEXIBLAS=trigger-warning + local -x FLEXIBLAS=libflexiblas_netlib.so + tc-export CC FC AR RANLIB cd "${WORKDIR}/lapack-${LAPACK_VER}" || die diff --git a/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-4.ebuild b/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-4.ebuild index 6a85cc49b619..a4eb340f097f 100644 --- a/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-4.ebuild +++ b/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-4.ebuild @@ -55,7 +55,7 @@ src_configure() { check_result() { local f=${1} - if ! grep -q "flexiblas.*TRIGGER-WARNING" "${f}.out"; then + if ! grep -q "<flexiblas> Check if shared library exist" "${f}.out"; then die "No FlexiBLAS output found in ${f}.out" fi if grep -q -i "FAIL" "${f}.out"; then @@ -72,10 +72,11 @@ run_test() { } src_test() { - # Force a nonexisting provider to: # a. get indication that FlexiBLAS is actually used on stderr. + local -x FLEXIBLAS_VERBOSE=1 # b. force fallback to Netlib LAPACK. - local -x FLEXIBLAS=trigger-warning + local -x FLEXIBLAS=libflexiblas_netlib.so + tc-export CC FC AR RANLIB cd "${WORKDIR}/lapack-${LAPACK_VER}" || die diff --git a/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-6.ebuild b/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-6.ebuild index 6a85cc49b619..a4eb340f097f 100644 --- a/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-6.ebuild +++ b/sci-libs/blas-lapack-aux-wrapper/blas-lapack-aux-wrapper-6.ebuild @@ -55,7 +55,7 @@ src_configure() { check_result() { local f=${1} - if ! grep -q "flexiblas.*TRIGGER-WARNING" "${f}.out"; then + if ! grep -q "<flexiblas> Check if shared library exist" "${f}.out"; then die "No FlexiBLAS output found in ${f}.out" fi if grep -q -i "FAIL" "${f}.out"; then @@ -72,10 +72,11 @@ run_test() { } src_test() { - # Force a nonexisting provider to: # a. get indication that FlexiBLAS is actually used on stderr. + local -x FLEXIBLAS_VERBOSE=1 # b. force fallback to Netlib LAPACK. - local -x FLEXIBLAS=trigger-warning + local -x FLEXIBLAS=libflexiblas_netlib.so + tc-export CC FC AR RANLIB cd "${WORKDIR}/lapack-${LAPACK_VER}" || die
