Skip to content

Commit

Permalink
build/pkgs/{givaro,fflas_ffpack,linbox}: Accept matching sets of old …
Browse files Browse the repository at this point in the history
…and new versions
  • Loading branch information
Matthias Koeppe committed Feb 2, 2024
1 parent 5ad42e8 commit db7703c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
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
2 changes: 1 addition & 1 deletion build/pkgs/givaro/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SAGE_SPKG_CONFIGURE([givaro], [
PKG_CHECK_MODULES([GIVARO],
[givaro >= 4.1.1],
[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 db7703c

Please sign in to comment.