diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml index 451560ecd8c..96ed2fb4bcd 100644 --- a/.github/workflows/ci-linux-incremental.yml +++ b/.github/workflows/ci-linux-incremental.yml @@ -139,7 +139,7 @@ jobs: # with only a small number of test failures as of 10.2.rc0 tox_system_factors: >- ["gentoo-python3.11", - "archlinux"] + "archlinux-latest"] tox_packages_factors: >- ["standard-sitepackages"] docker_push_repository: ghcr.io/${{ github.repository }}/ diff --git a/build/pkgs/fflas_ffpack/spkg-configure.m4 b/build/pkgs/fflas_ffpack/spkg-configure.m4 index 01a04713f07..646cfb527e4 100644 --- a/build/pkgs/fflas_ffpack/spkg-configure.m4 +++ b/build/pkgs/fflas_ffpack/spkg-configure.m4 @@ -4,7 +4,7 @@ SAGE_SPKG_CONFIGURE([fflas_ffpack], [ # the system fflas-ffpack, too. Use pkg-config to find a # recentish version, if there is one. PKG_CHECK_MODULES([FFLAS_FFPACK], - [fflas-ffpack >= 2.4.0], + [fflas-ffpack >= 2.4.0],dnl The version test is refined in linbox/spkg-configure.m4 [sage_spkg_install_fflas_ffpack=no], [sage_spkg_install_fflas_ffpack=yes]) ]) diff --git a/build/pkgs/givaro/spkg-configure.m4 b/build/pkgs/givaro/spkg-configure.m4 index 84c4af52087..36cfab37081 100644 --- a/build/pkgs/givaro/spkg-configure.m4 +++ b/build/pkgs/givaro/spkg-configure.m4 @@ -1,25 +1,6 @@ SAGE_SPKG_CONFIGURE([givaro], [ - m4_pushdef([SAGE_GIVARO_MINVER],["40101"]) - m4_pushdef([SAGE_GIVARO_LTVER],["40200"]) - SAGE_SPKG_DEPCHECK([gmp], [ - AC_PATH_PROG([GIVAROCONFIG], [givaro-config]) - AS_IF([test x$GIVAROCONFIG = x], [ - AC_MSG_NOTICE([givaro-config not found. Installing givaro]) - sage_spkg_install_givaro=yes], [ - AC_MSG_CHECKING([is givaro's version acceptable? ]) - givaro_ver=`$GIVAROCONFIG --decimal-version 2>> config.log` - AX_COMPARE_VERSION([$givaro_ver], [ge], SAGE_GIVARO_MINVER, [ - AX_COMPARE_VERSION([$givaro_ver], [lt], SAGE_GIVARO_LTVER, [ - AC_MSG_RESULT([yes])], [ - AC_MSG_RESULT([no, too new]) - sage_spkg_install_givaro=yes - ]) - ], [ - AC_MSG_RESULT([no, too old]) - sage_spkg_install_givaro=yes - ]) - ]) - ]) - m4_popdef([SAGE_GIVARO_LTVER]) - m4_popdef([SAGE_GIVARO_MINVER]) + PKG_CHECK_MODULES([GIVARO], + [givaro >= 4.1.1],dnl The version test is refined in linbox/spkg-configure.m4 + [sage_spkg_install_givaro=no], + [sage_spkg_install_givaro=yes]) ]) diff --git a/build/pkgs/linbox/spkg-configure.m4 b/build/pkgs/linbox/spkg-configure.m4 index 1571c9de790..8c5b85ef7fd 100644 --- a/build/pkgs/linbox/spkg-configure.m4 +++ b/build/pkgs/linbox/spkg-configure.m4 @@ -1,8 +1,16 @@ SAGE_SPKG_CONFIGURE([linbox], [ SAGE_SPKG_DEPCHECK([fflas_ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [ - PKG_CHECK_MODULES([LINBOX], - [linbox >= 1.6.3 linbox <= 1.6.4], - [sage_spkg_install_linbox=no], - [sage_spkg_install_linbox=yes]) + PKG_CHECK_MODULES([LINBOX],dnl Check for a set of matching old versions + [linbox >= 1.6.3 linbox <= 1.6.4 fflas-ffpack >= 2.4.0 fflas-ffpack < 2.5.0 givaro >= 4.1.1 givaro < 4.2.0], + [sage_spkg_install_linbox=no], + [PKG_CHECK_MODULES([LINBOX],dnl Check for a set of matching new versions + [linbox >= 1.7.0 linbox <= 1.7.0 fflas-ffpack >= 2.5.0 givaro >= 4.2.0 givaro < 4.3.0], + [sage_spkg_install_linbox=no], + [sage_spkg_install_linbox=yes])]) ]) +], [dnl REQUIRED_CHECK +], [dnl PRE +], [dnl POST + sage_spkg_install_fflas_ffpack=$sage_spkg_install_linbox + sage_spkg_install_givaro=$sage_spkg_install_linbox ])