From 62dc5bc47e71370b53356630a158f63daad4c81d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 25 Feb 2024 14:33:44 -0800 Subject: [PATCH 1/7] build/pkgs/flint: Update to 3.1.0 --- build/pkgs/flint/checksums.ini | 6 +++--- build/pkgs/flint/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini index ab836606657..1ee7e25b3b1 100644 --- a/build/pkgs/flint/checksums.ini +++ b/build/pkgs/flint/checksums.ini @@ -1,5 +1,5 @@ tarball=flint-VERSION.tar.gz -sha1=65be9297c06edd7e24f20874b7bd6130cee56723 -md5=5189f67b0ec12e4a54d6782851642b81 -cksum=172350473 +sha1=5100633e0079e164d93a3e7b8f06e36911c4971b +md5=b172ad8fc59cbb2fa2f2ab31bb3c61fd +cksum=3513046366 upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz diff --git a/build/pkgs/flint/package-version.txt b/build/pkgs/flint/package-version.txt index cb2b00e4f7a..fd2a01863fd 100644 --- a/build/pkgs/flint/package-version.txt +++ b/build/pkgs/flint/package-version.txt @@ -1 +1 @@ -3.0.1 +3.1.0 From 1cda1dfb5d51b5222fed3d4d32e723835a20d07c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 25 Feb 2024 14:37:41 -0800 Subject: [PATCH 2/7] build/pkgs/flint/patches/0001-Makefile.in-fix-handling-of-DESTDIR.patch: Remove --- ...-Makefile.in-fix-handling-of-DESTDIR.patch | 106 ------------------ 1 file changed, 106 deletions(-) delete mode 100644 build/pkgs/flint/patches/0001-Makefile.in-fix-handling-of-DESTDIR.patch diff --git a/build/pkgs/flint/patches/0001-Makefile.in-fix-handling-of-DESTDIR.patch b/build/pkgs/flint/patches/0001-Makefile.in-fix-handling-of-DESTDIR.patch deleted file mode 100644 index 48a32f5d894..00000000000 --- a/build/pkgs/flint/patches/0001-Makefile.in-fix-handling-of-DESTDIR.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 54277f054f13254898c9a57c2c7eb869877e1252 Mon Sep 17 00:00:00 2001 -From: Marc Mezzarobba -Date: Mon, 13 Nov 2023 10:23:54 +0100 -Subject: [PATCH] Makefile.in: fix handling of $DESTDIR - ---- - Makefile.in | 54 ++++++++++++++++++++++++++--------------------------- - 1 file changed, 27 insertions(+), 27 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 08db6837c..2827b9da1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -34,9 +34,9 @@ FLINT_SOLIB:=@FLINT_SOLIB@ - prefix:=@prefix@ - exec_prefix:=@exec_prefix@ - --INCLUDEDIR:=$(DESTDIR)@includedir@ --LIBDIR:=$(DESTDIR)@libdir@ --BINDIR:=$(DESTDIR)@bindir@ -+INCLUDEDIR:=@includedir@ -+LIBDIR:=@libdir@ -+BINDIR:=@bindir@ - PKGCONFIGDIR:=$(LIBDIR)/pkgconfig - - HOST_OS:=@host_os@ -@@ -202,10 +202,10 @@ BUILD_DIRS += \ - endif - - INSTALL_DIRS := \ -- $(LIBDIR) $(INCLUDEDIR)/flint \ -- $(PKGCONFIGDIR) -+ $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)/flint \ -+ $(DESTDIR)$(PKGCONFIGDIR) - ifneq ($(FLINT_DLLLIB),0) --INSTALL_DIRS += $(BINDIR) -+INSTALL_DIRS += $(DESTDIR)$(BINDIR) - endif - - ################################################################################ -@@ -722,41 +722,41 @@ distclean: clean - ################################################################################ - - install: library | $(INSTALL_DIRS) -- $(CP) flint.pc $(PKGCONFIGDIR)/flint.pc -+ $(CP) flint.pc $(DESTDIR)$(PKGCONFIGDIR)/flint.pc - ifneq ($(SHARED), 0) - ifneq ($(FLINT_DLLLIB),0) -- $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(BINDIR) -- $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(BINDIR) -- $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(BINDIR) -- $(CP) $(FLINT_DIR)/$(FLINT_IMPLIB) $(LIBDIR) -+ $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(DESTDIR)$(BINDIR) -+ $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(DESTDIR)$(BINDIR) -+ $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(BINDIR) -+ $(CP) $(FLINT_DIR)/$(FLINT_IMPLIB) $(DESTDIR)$(LIBDIR) - else -- $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(LIBDIR) -- $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(LIBDIR) -- $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(LIBDIR) -+ $(CP_A) $(FLINT_DIR)/$(FLINT_LIB) $(DESTDIR)$(LIBDIR) -+ $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_MAJOR) $(DESTDIR)$(LIBDIR) -+ $(CP_A) $(FLINT_DIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(LIBDIR) - endif - ifneq ($(FLINT_DYLIB),0) -- install_name_tool -id $(LIBDIR)/$(FLINT_LIB_FULL) $(LIBDIR)/$(FLINT_LIB) -+ install_name_tool -id $(LIBDIR)/$(FLINT_LIB_FULL) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB) - endif - endif - ifneq ($(STATIC), 0) -- $(CP) $(FLINT_DIR)/$(FLINT_LIB_STATIC) $(LIBDIR) -+ $(CP) $(FLINT_DIR)/$(FLINT_LIB_STATIC) $(DESTDIR)$(LIBDIR) - endif -- $(CP) $(HEADERS) $(INCLUDEDIR)/flint -+ $(CP) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/flint - - uninstall: -- $(RM_F) $(PKGCONFIGDIR)/flint.pc -+ $(RM_F) $(DESTDIR)$(PKGCONFIGDIR)/flint.pc - ifneq ($(FLINT_DLLLIB),0) -- $(RM_F) $(BINDIR)/$(FLINT_LIB) -- $(RM_F) $(BINDIR)/$(FLINT_LIB_MAJOR) -- $(RM_F) $(BINDIR)/$(FLINT_LIB_FULL) -- $(RM_F) $(LIBDIR)/$(FLINT_IMPLIB) -+ $(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB) -+ $(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB_MAJOR) -+ $(RM_F) $(DESTDIR)$(BINDIR)/$(FLINT_LIB_FULL) -+ $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_IMPLIB) - else -- $(RM_F) $(LIBDIR)/$(FLINT_LIB) -- $(RM_F) $(LIBDIR)/$(FLINT_LIB_MAJOR) -- $(RM_F) $(LIBDIR)/$(FLINT_LIB_FULL) -+ $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB) -+ $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_MAJOR) -+ $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_FULL) - endif -- $(RM_F) $(LIBDIR)/$(FLINT_LIB_STATIC) -- $(RM_RF) $(INCLUDEDIR)/flint -+ $(RM_F) $(DESTDIR)$(LIBDIR)/$(FLINT_LIB_STATIC) -+ $(RM_RF) $(DESTDIR)$(INCLUDEDIR)/flint - - ################################################################################ - # maintainer stuff --- -2.42.0 - From 4b253b58d97ad949ef6114e1ca4fe69dbf712cf3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 9 Apr 2024 22:24:14 -0700 Subject: [PATCH 3/7] build/pkgs/flint: Update to 3.1.2 --- build/pkgs/flint/checksums.ini | 6 +++--- build/pkgs/flint/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini index 1ee7e25b3b1..59a2743e089 100644 --- a/build/pkgs/flint/checksums.ini +++ b/build/pkgs/flint/checksums.ini @@ -1,5 +1,5 @@ tarball=flint-VERSION.tar.gz -sha1=5100633e0079e164d93a3e7b8f06e36911c4971b -md5=b172ad8fc59cbb2fa2f2ab31bb3c61fd -cksum=3513046366 +sha1=bc3b521c97119a8ce1db603a381c0a9bab0810c8 +md5=69326b8baad110f04601a5fed97610f6 +cksum=2579119628 upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz diff --git a/build/pkgs/flint/package-version.txt b/build/pkgs/flint/package-version.txt index fd2a01863fd..ef538c28109 100644 --- a/build/pkgs/flint/package-version.txt +++ b/build/pkgs/flint/package-version.txt @@ -1 +1 @@ -3.1.0 +3.1.2 From fc47aea0fe1125dc60fef218629db99b7f8667c3 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 1 May 2024 17:01:15 -0700 Subject: [PATCH 4/7] build/pkgs/flint: Update to 3.1.3 --- build/pkgs/flint/checksums.ini | 6 +++--- build/pkgs/flint/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini index 59a2743e089..495f73a6788 100644 --- a/build/pkgs/flint/checksums.ini +++ b/build/pkgs/flint/checksums.ini @@ -1,5 +1,5 @@ tarball=flint-VERSION.tar.gz -sha1=bc3b521c97119a8ce1db603a381c0a9bab0810c8 -md5=69326b8baad110f04601a5fed97610f6 -cksum=2579119628 +sha1=35af6e2de8765a841952438f3c915d0505b983b6 +md5=f449b4902c51b03e902b2b8bc6ef1307 +cksum=1303232242 upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz diff --git a/build/pkgs/flint/package-version.txt b/build/pkgs/flint/package-version.txt index ef538c28109..ff365e06b95 100644 --- a/build/pkgs/flint/package-version.txt +++ b/build/pkgs/flint/package-version.txt @@ -1 +1 @@ -3.1.2 +3.1.3 From 18e1d4f184c8d68567efdf56303e19cbf163d70d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 30 Jan 2024 17:21:50 -0800 Subject: [PATCH 5/7] build/pkgs/gmp/spkg-configure.m4: Check the actual GMP version, to match check in FLINT 3.1 --- build/pkgs/gmp/spkg-configure.m4 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/build/pkgs/gmp/spkg-configure.m4 b/build/pkgs/gmp/spkg-configure.m4 index 4000200db2c..9d6a9b9d554 100644 --- a/build/pkgs/gmp/spkg-configure.m4 +++ b/build/pkgs/gmp/spkg-configure.m4 @@ -2,6 +2,26 @@ SAGE_SPKG_CONFIGURE([gmp], [ sage_spkg_install_gmp=no AC_CHECK_HEADER(gmp.h, [], [sage_spkg_install_gmp=yes]) AC_CHECK_HEADER(gmpxx.h, [], [sage_spkg_install_gmp=yes]) + # Check that GMP >= 6.2.1; this test is copied from FLINT. + AC_MSG_CHECKING([if version of GMP is greater than 6.2.1]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[#include + ]], + [[#if (__GNU_MP_VERSION < 6) \ + || (__GNU_MP_VERSION == 6 && __GNU_MP_VERSION_MINOR < 2) \ + || (__GNU_MP_VERSION == 6 && __GNU_MP_VERSION_MINOR == 2 && __GNU_MP_VERSION_PATCHLEVEL < 1) + # error GMP version 6.2.1 or later is required + #endif + ]] + )], [dnl + AC_MSG_RESULT([yes]) + ], [dnl + AC_MSG_RESULT([no]) + sage_spkg_install_gmp=yes + ]) + dnl The test above uses the headers only. To protect against header/library + dnl mismatches, we now check for a function. dnl mpn_gcd_11 appeared in GMP 6.2.1 dnl It is undocumented but is used by Flint when built with default dnl flags. From 090a5af531f77b4d635053ac6919ae179bc9dc7d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 20 May 2024 10:13:52 -0700 Subject: [PATCH 6/7] build/pkgs/gmp/spkg-configure.m4: Cosmetic fixes --- build/pkgs/gmp/spkg-configure.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/gmp/spkg-configure.m4 b/build/pkgs/gmp/spkg-configure.m4 index 9d6a9b9d554..560ae916fba 100644 --- a/build/pkgs/gmp/spkg-configure.m4 +++ b/build/pkgs/gmp/spkg-configure.m4 @@ -1,5 +1,5 @@ -SAGE_SPKG_CONFIGURE([gmp], [ - sage_spkg_install_gmp=no +SAGE_SPKG_CONFIGURE([gmp], [dnl + sage_spkg_install_gmp=no AC_CHECK_HEADER(gmp.h, [], [sage_spkg_install_gmp=yes]) AC_CHECK_HEADER(gmpxx.h, [], [sage_spkg_install_gmp=yes]) # Check that GMP >= 6.2.1; this test is copied from FLINT. @@ -27,7 +27,7 @@ SAGE_SPKG_CONFIGURE([gmp], [ dnl flags. AC_SEARCH_LIBS([__gmpn_gcd_11], [gmp], [], [sage_spkg_install_gmp=yes]) -], [], [], [ +], [], [], [dnl if test x$sage_spkg_install_gmp = xyes; then AC_SUBST(SAGE_GMP_PREFIX, ['$SAGE_LOCAL']) AC_SUBST(SAGE_GMP_INCLUDE, ['$SAGE_LOCAL/include']) From e2d2df447d27fb1b7ff8f7184c2f3fc5d8f4ecec Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 20 May 2024 10:14:50 -0700 Subject: [PATCH 7/7] sage -package fix-checksum flint --- build/pkgs/flint/checksums.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/pkgs/flint/checksums.ini b/build/pkgs/flint/checksums.ini index 495f73a6788..804f58da22a 100644 --- a/build/pkgs/flint/checksums.ini +++ b/build/pkgs/flint/checksums.ini @@ -1,5 +1,4 @@ tarball=flint-VERSION.tar.gz sha1=35af6e2de8765a841952438f3c915d0505b983b6 -md5=f449b4902c51b03e902b2b8bc6ef1307 -cksum=1303232242 +sha256=3259e5ecbb07ea3bebeff025f846a494087be92b0aaf0636d6e36128963cadda upstream_url=https://github.com/flintlib/flint/releases/download/vVERSION/flint-VERSION.tar.gz