Skip to content

Commit d4b28e1

Browse files
author
Release Manager
committed
gh-36997: `build/pkgs/{givaro,fflas_ffpack,linbox}`: Accept matching set of new versions <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> Resolves #34359. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [ ] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies - Depends on #36829 (to help with testing) <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36997 Reported by: Matthias Köppe Reviewer(s):
2 parents 647ec81 + 9699e4c commit d4b28e1

File tree

4 files changed

+18
-29
lines changed

4 files changed

+18
-29
lines changed

.github/workflows/ci-linux-incremental.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
# with only a small number of test failures as of 10.2.rc0
140140
tox_system_factors: >-
141141
["gentoo-python3.11",
142-
"archlinux"]
142+
"archlinux-latest"]
143143
tox_packages_factors: >-
144144
["standard-sitepackages"]
145145
docker_push_repository: ghcr.io/${{ github.repository }}/

build/pkgs/fflas_ffpack/spkg-configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SAGE_SPKG_CONFIGURE([fflas_ffpack], [
44
# the system fflas-ffpack, too. Use pkg-config to find a
55
# recentish version, if there is one.
66
PKG_CHECK_MODULES([FFLAS_FFPACK],
7-
[fflas-ffpack >= 2.4.0],
7+
[fflas-ffpack >= 2.4.0],dnl The version test is refined in linbox/spkg-configure.m4
88
[sage_spkg_install_fflas_ffpack=no],
99
[sage_spkg_install_fflas_ffpack=yes])
1010
])
Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,6 @@
11
SAGE_SPKG_CONFIGURE([givaro], [
2-
m4_pushdef([SAGE_GIVARO_MINVER],["40101"])
3-
m4_pushdef([SAGE_GIVARO_LTVER],["40200"])
4-
SAGE_SPKG_DEPCHECK([gmp], [
5-
AC_PATH_PROG([GIVAROCONFIG], [givaro-config])
6-
AS_IF([test x$GIVAROCONFIG = x], [
7-
AC_MSG_NOTICE([givaro-config not found. Installing givaro])
8-
sage_spkg_install_givaro=yes], [
9-
AC_MSG_CHECKING([is givaro's version acceptable? ])
10-
givaro_ver=`$GIVAROCONFIG --decimal-version 2>> config.log`
11-
AX_COMPARE_VERSION([$givaro_ver], [ge], SAGE_GIVARO_MINVER, [
12-
AX_COMPARE_VERSION([$givaro_ver], [lt], SAGE_GIVARO_LTVER, [
13-
AC_MSG_RESULT([yes])], [
14-
AC_MSG_RESULT([no, too new])
15-
sage_spkg_install_givaro=yes
16-
])
17-
], [
18-
AC_MSG_RESULT([no, too old])
19-
sage_spkg_install_givaro=yes
20-
])
21-
])
22-
])
23-
m4_popdef([SAGE_GIVARO_LTVER])
24-
m4_popdef([SAGE_GIVARO_MINVER])
2+
PKG_CHECK_MODULES([GIVARO],
3+
[givaro >= 4.1.1],dnl The version test is refined in linbox/spkg-configure.m4
4+
[sage_spkg_install_givaro=no],
5+
[sage_spkg_install_givaro=yes])
256
])
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
SAGE_SPKG_CONFIGURE([linbox], [
22
SAGE_SPKG_DEPCHECK([fflas_ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [
3-
PKG_CHECK_MODULES([LINBOX],
4-
[linbox >= 1.6.3 linbox <= 1.6.4],
5-
[sage_spkg_install_linbox=no],
6-
[sage_spkg_install_linbox=yes])
3+
PKG_CHECK_MODULES([LINBOX],dnl Check for a set of matching old versions
4+
[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],
5+
[sage_spkg_install_linbox=no],
6+
[PKG_CHECK_MODULES([LINBOX],dnl Check for a set of matching new versions
7+
[linbox >= 1.7.0 linbox <= 1.7.0 fflas-ffpack >= 2.5.0 givaro >= 4.2.0 givaro < 4.3.0],
8+
[sage_spkg_install_linbox=no],
9+
[sage_spkg_install_linbox=yes])])
710
])
11+
], [dnl REQUIRED_CHECK
12+
], [dnl PRE
13+
], [dnl POST
14+
sage_spkg_install_fflas_ffpack=$sage_spkg_install_linbox
15+
sage_spkg_install_givaro=$sage_spkg_install_linbox
816
])

0 commit comments

Comments
 (0)