Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/pkgs/eclib/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=eclib-VERSION.tar.bz2
sha1=ec8dd87df46ac5a54b548354681085d1da6e7e13
sha256=9f8c2b32e24a4f20d7cc2d336ea30c8ea03b5b0953c2d32adda0c496e7616899
sha1=5593348fef3ee35918815fbc6444c3003bdb4fa4
sha256=b88d4b52612e491c5415946d9e35f2062ca1015ee7fbbe0b61f158fa74cb4bc9
upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/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 @@
20250122
20250627
2 changes: 1 addition & 1 deletion build/pkgs/eclib/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SAGE_SPKG_CONFIGURE([eclib], [
SAGE_SPKG_DEPCHECK([ntl pari flint], [
dnl use existing eclib only if the version reported by pkg-config is recent enough
m4_pushdef([SAGE_ECLIB_VER],["20241112"])
m4_pushdef([SAGE_ECLIB_VER],["20250627"])
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], [
Expand Down
4 changes: 2 additions & 2 deletions build/pkgs/flint/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=flint-VERSION.tar.gz
sha1=ebca3a55e48373c2eeee6c172051f3177845e121
sha256=577d7729e4c2e79ca1e894ad2ce34bc73516a92f623d42562694817f888a17eb
sha1=dae6d32b25e46a6ab92514b4dfa64b06fdf247ec
sha256=64d70e513076cfa971e0410b58c1da5d35112913e9a56b44e2c681b459d3eafb
upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/flint/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.1
4 changes: 4 additions & 0 deletions build/pkgs/flint/spkg-build.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
cd src

# See https://github.com/flintlib/flint/issues/2340
export CFLAGS="$CFLAGS -fno-strict-aliasing"

sdh_configure
sdh_make
26 changes: 26 additions & 0 deletions build/pkgs/singular/patches/flint-3.3.0-compatibility.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/factory/FLINTconvert.cc b/factory/FLINTconvert.cc
index c36f6022d..67c271c5a 100644
--- a/factory/FLINTconvert.cc
+++ b/factory/FLINTconvert.cc
@@ -652,7 +652,7 @@ convertFacCFMatrix2Fq_nmod_mat_t (fq_nmod_mat_t M,
{
for(j=m.columns();j>0;j--)
{
- convertFacCF2nmod_poly_t (M->rows[i-1]+j-1, m (i,j));
+ convertFacCF2nmod_poly_t (fq_nmod_mat_entry (M, i-1, j-1), m (i,j));
}
}
}
diff --git a/libpolys/polys/flintconv.cc b/libpolys/polys/flintconv.cc
index 89152f5e4..56d527c16 100644
--- a/libpolys/polys/flintconv.cc
+++ b/libpolys/polys/flintconv.cc
@@ -331,7 +331,7 @@ void convSingMFlintFq_nmod_mat(matrix m, fq_nmod_mat_t M, const fq_nmod_ctx_t fq
{
for(j=MATCOLS(m);j>0;j--)
{
- convSingPFlintnmod_poly_t (M->rows[i-1]+j-1, MATELEM(m,i,j),r);
+ convSingPFlintnmod_poly_t (fq_nmod_mat_entry (M, i-1, j-1), MATELEM(m,i,j),r);
}
}
}
Loading