diff --git a/build/pkgs/eclib/checksums.ini b/build/pkgs/eclib/checksums.ini index 266e6bfac1c..b6a7efd95aa 100644 --- a/build/pkgs/eclib/checksums.ini +++ b/build/pkgs/eclib/checksums.ini @@ -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 diff --git a/build/pkgs/eclib/package-version.txt b/build/pkgs/eclib/package-version.txt index b5f339e560b..190b92f716b 100644 --- a/build/pkgs/eclib/package-version.txt +++ b/build/pkgs/eclib/package-version.txt @@ -1 +1 @@ -20230424 +20231212 diff --git a/build/pkgs/eclib/spkg-configure.m4 b/build/pkgs/eclib/spkg-configure.m4 index c98781201cc..133b44bfdc1 100644 --- a/build/pkgs/eclib/spkg-configure.m4 +++ b/build/pkgs/eclib/spkg-configure.m4 @@ -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" ]) ]) diff --git a/build/pkgs/eclib/spkg-install.in b/build/pkgs/eclib/spkg-install.in index 4998cff1676..9618e8f5d19 100644 --- a/build/pkgs/eclib/spkg-install.in +++ b/build/pkgs/eclib/spkg-install.in @@ -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