Skip to content

Commit 200c626

Browse files
author
Matthias Koeppe
committed
build/pkgs/openblas/spkg-configure.m4: Reject version 0.3.22
1 parent 82e02a1 commit 200c626

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

build/pkgs/openblas/spkg-configure.m4

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ SAGE_SPKG_CONFIGURE([openblas], [
77
m4_pushdef([SAGE_OPENBLAS_MIN_VERSION_MINOR], [2])
88
m4_pushdef([SAGE_OPENBLAS_MIN_VERSION_MICRO], [20])
99
m4_pushdef([SAGE_OPENBLAS_MIN_VERSION], [SAGE_OPENBLAS_MIN_VERSION_MAJOR.SAGE_OPENBLAS_MIN_VERSION_MINOR.SAGE_OPENBLAS_MIN_VERSION_MICRO])
10-
PKG_CHECK_MODULES([OPENBLAS], [openblas >= ]SAGE_OPENBLAS_MIN_VERSION, [
10+
dnl Reject openblas 0.3.22 - https://github.com/sagemath/sage/pull/35371
11+
m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MAJOR], [0])
12+
m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MINOR], [3])
13+
m4_pushdef([SAGE_OPENBLAS_LT_VERSION_MICRO], [22])
14+
m4_pushdef([SAGE_OPENBLAS_LT_VERSION], [SAGE_OPENBLAS_LT_VERSION_MAJOR.SAGE_OPENBLAS_LT_VERSION_MINOR.SAGE_OPENBLAS_LT_VERSION_MICRO])
15+
PKG_CHECK_MODULES([OPENBLAS], [openblas >= ]SAGE_OPENBLAS_MIN_VERSION [openblas < ]SAGE_OPENBLAS_LT_VERSION, [
1116
LIBS="$OPENBLAS_LIBS $LIBS"
1217
CFLAGS="$OPENBLAS_CFLAGS $CFLAGS"
1318
PKG_CHECK_VAR([OPENBLASPCDIR], [openblas], [pcfiledir], [
@@ -74,6 +79,13 @@ SAGE_SPKG_CONFIGURE([openblas], [
7479
< 10000 * ]]SAGE_OPENBLAS_MIN_VERSION_MAJOR[[
7580
+ 100 * ]]SAGE_OPENBLAS_MIN_VERSION_MINOR[[
7681
+ ]]SAGE_OPENBLAS_MIN_VERSION_MICRO[[)
82+
return 1;
83+
if ( 10000 * version[0]
84+
+ 100 * version[1]
85+
+ version[2]
86+
>=10000 * ]]SAGE_OPENBLAS_LT_VERSION_MAJOR[[
87+
+ 100 * ]]SAGE_OPENBLAS_LT_VERSION_MINOR[[
88+
+ ]]SAGE_OPENBLAS_LT_VERSION_MICRO[[)
7789
return 1;]])
7890
], [AS_VAR_SET([HAVE_OPENBLAS], [yes])], [AS_VAR_SET([HAVE_OPENBLAS], [no])],
7991
[AS_VAR_SET([HAVE_OPENBLAS], [yes])])

0 commit comments

Comments
 (0)