From 200c62637b309b90fff1e7c913d826e6d1c87488 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 28 Mar 2023 16:16:08 -0700 Subject: [PATCH] build/pkgs/openblas/spkg-configure.m4: Reject version 0.3.22 --- build/pkgs/openblas/spkg-configure.m4 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/build/pkgs/openblas/spkg-configure.m4 b/build/pkgs/openblas/spkg-configure.m4 index c81533ba71a..3743839a51a 100644 --- a/build/pkgs/openblas/spkg-configure.m4 +++ b/build/pkgs/openblas/spkg-configure.m4 @@ -7,7 +7,12 @@ SAGE_SPKG_CONFIGURE([openblas], [ m4_pushdef([SAGE_OPENBLAS_MIN_VERSION_MINOR], [2]) m4_pushdef([SAGE_OPENBLAS_MIN_VERSION_MICRO], [20]) m4_pushdef([SAGE_OPENBLAS_MIN_VERSION], [SAGE_OPENBLAS_MIN_VERSION_MAJOR.SAGE_OPENBLAS_MIN_VERSION_MINOR.SAGE_OPENBLAS_MIN_VERSION_MICRO]) - PKG_CHECK_MODULES([OPENBLAS], [openblas >= ]SAGE_OPENBLAS_MIN_VERSION, [ + dnl Reject openblas 0.3.22 - https://github.com/sagemath/sage/pull/35371 + m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MAJOR], [0]) + m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MINOR], [3]) + m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MICRO], [22]) + m4_pushdef([SAGE_OPENBLAS_LT_VERSION], [SAGE_OPENBLAS_LT_VERSION_MAJOR.SAGE_OPENBLAS_LT_VERSION_MINOR.SAGE_OPENBLAS_LT_VERSION_MICRO]) + PKG_CHECK_MODULES([OPENBLAS], [openblas >= ]SAGE_OPENBLAS_MIN_VERSION [openblas < ]SAGE_OPENBLAS_LT_VERSION, [ LIBS="$OPENBLAS_LIBS $LIBS" CFLAGS="$OPENBLAS_CFLAGS $CFLAGS" PKG_CHECK_VAR([OPENBLASPCDIR], [openblas], [pcfiledir], [ @@ -74,6 +79,13 @@ SAGE_SPKG_CONFIGURE([openblas], [ < 10000 * ]]SAGE_OPENBLAS_MIN_VERSION_MAJOR[[ + 100 * ]]SAGE_OPENBLAS_MIN_VERSION_MINOR[[ + ]]SAGE_OPENBLAS_MIN_VERSION_MICRO[[) + return 1; + if ( 10000 * version[0] + + 100 * version[1] + + version[2] + >=10000 * ]]SAGE_OPENBLAS_LT_VERSION_MAJOR[[ + + 100 * ]]SAGE_OPENBLAS_LT_VERSION_MINOR[[ + + ]]SAGE_OPENBLAS_LT_VERSION_MICRO[[) return 1;]]) ], [AS_VAR_SET([HAVE_OPENBLAS], [yes])], [AS_VAR_SET([HAVE_OPENBLAS], [no])], [AS_VAR_SET([HAVE_OPENBLAS], [yes])])