Skip to content

Commit

Permalink
sagemathgh-36879: update eclib to version 20231212
Browse files Browse the repository at this point in the history
    
eclib version 20231212 has some bugfixes and also uses flint3 if
available.  No Sage code or doctest changes are required.

build/pkgs/eclib/spkg-install.in has been simplified
buid/pkgs/eclib/spkg-configure.m4 now uses [ge] and not [eq] to check
eclib version

### 📝 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. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.

### ⌛ Dependencies

<!-- 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#36879
Reported by: John Cremona
Reviewer(s): Dima Pasechnik
  • Loading branch information
Release Manager committed Dec 22, 2023
2 parents 3618281 + a54dcee commit 301a54c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 21 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/eclib/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=eclib-VERSION.tar.bz2
sha1=bd49acf96c4e7246c8ca3e5d188ae1b03a3aeff3
md5=42721f2f1343c49dc774763a57a85ca6
cksum=3624641360
sha1=3028ac95e1b76699f5f9e871ac706cda363ab842
md5=c96e1bb39a50552aeac6675b907709b8
cksum=2027019032
upstream_url=https://github.com/JohnCremona/eclib/releases/download/vVERSION/eclib-VERSION.tar.bz2
2 changes: 1 addition & 1 deletion build/pkgs/eclib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20230424
20231212
6 changes: 3 additions & 3 deletions build/pkgs/eclib/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
SAGE_SPKG_CONFIGURE([eclib], [
SAGE_SPKG_DEPCHECK([ntl pari flint], [
dnl Trac #31443, #34029: use existing eclib only if the version reported by pkg-config is correct
m4_pushdef([SAGE_ECLIB_VER],["20230424"])
dnl use existing eclib only if the version reported by pkg-config is recent enough
m4_pushdef([SAGE_ECLIB_VER],["20231212"])
PKG_CHECK_MODULES([ECLIB], [eclib = SAGE_ECLIB_VER], [
AC_CACHE_CHECK([for mwrank version == SAGE_ECLIB_VER], [ac_cv_path_MWRANK], [
AC_PATH_PROGS_FEATURE_CHECK([MWRANK], [mwrank], [
mwrank_version=`$ac_path_MWRANK -V 2>&1`
AX_COMPARE_VERSION([$mwrank_version], [eq], [SAGE_ECLIB_VER], [
AX_COMPARE_VERSION([$mwrank_version], [ge], [SAGE_ECLIB_VER], [
ac_cv_path_MWRANK="$ac_path_MWRANK"
])
])
Expand Down
15 changes: 1 addition & 14 deletions build/pkgs/eclib/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,9 @@ export CFLAGS CXXFLAGS

cd src/

#############################################################
# the workaround with SAGE_CONFIGURE_FLINT_ECLIB
# introduced by #28401 may be removed once
# github.com/JohnCremona/eclib/pull/57 is in Sage
#############################################################
if test x$SAGE_FLINT_PREFIX = x; then
SAGE_CONFIGURE_FLINT_ECLIB="--with-flint"
else
SAGE_CONFIGURE_FLINT_ECLIB="--with-flint=$SAGE_FLINT_PREFIX"
fi

echo $SAGE_CONFIGURE_FLINT_ECLIB

sdh_configure $SAGE_CONFIGURE_NTL \
$SAGE_CONFIGURE_PARI \
$SAGE_CONFIGURE_FLINT_ECLIB \
--with-flint=$SAGE_FLINT_PREFIX \
--with-boost="no" \
--disable-allprogs
sdh_make
Expand Down

0 comments on commit 301a54c

Please sign in to comment.