Skip to content

Commit

Permalink
sagemathgh-36997: build/pkgs/{givaro,fflas_ffpack,linbox}: Accept m…
Browse files Browse the repository at this point in the history
…atching 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 sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

Resolves sagemath#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 sagemath#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 sagemath#36829 (to help with testing)

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36997
Reported by: Matthias Köppe
Reviewer(s):
  • Loading branch information
Release Manager committed Feb 11, 2024
2 parents 647ec81 + 9699e4c commit d4b28e1
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-linux-incremental.yml
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
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
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
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
])

0 comments on commit d4b28e1

Please sign in to comment.