Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build/pkgs/{givaro,fflas_ffpack,linbox}: Accept matching set of new versions #36997

Merged
merged 3 commits into from
Feb 13, 2024
Merged

build/pkgs/{givaro,fflas_ffpack,linbox}: Accept matching set of new versions #36997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ad42e8
build/pkgs/givaro/spkg-configure.m4: Switch to using pkg-config
mkoeppe Jan 3, 2024
db7703c
build/pkgs/{givaro,fflas_ffpack,linbox}: Accept matching sets of old …
mkoeppe Jan 3, 2024
9699e4c
.github/workflows/ci-linux-incremental.yml: Fix name of archlinux
mkoeppe Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux-incremental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}/
2 changes: 1 addition & 1 deletion build/pkgs/fflas_ffpack/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
])
Expand Down
27 changes: 4 additions & 23 deletions build/pkgs/givaro/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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])
])
16 changes: 12 additions & 4 deletions build/pkgs/linbox/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
])
Loading