Bump to FLINT 3.5.0

.github/workflows/buildwheel.yml

@@ -307,7 +307,13 @@ jobs:
       fail-fast: false
       matrix:
         # Supported Flint versions:
-        flint-tag: ['v3.0.1', 'v3.1.3-p1', 'v3.2.2', 'v3.3.1']
+        flint-tag: [
+          'v3.0.1',
+          'v3.1.3-p1',
+          'v3.2.2',
+          'v3.3.1',
+          'v3.4.0',
+        ]
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:

README.md

@@ -144,7 +144,7 @@ Compatible versions:
 
 | python-flint | Release date  | CPython     | FLINT      | Cython           |
 |--------------|---------------|-------------|------------|------------------|
-| `0.9.0`      |      ???      | `3.11-3.14` | `3.0-3.4`  | `3.1-3.2?`       |
+| `0.9.0`      |      ???      | `3.11-3.14` | `3.0-3.5`  | `3.1-3.2?`       |
 | `0.8.0`      | 29th Aug 2025 | `3.11-3.14` | `3.0-3.3`  | `3.1` only       |
 | `0.7.0`      | 16th Mar 2025 | `3.11-3.13` | `3.0-3.2`  | `3.0.11-3.1.0a1` |
 | `0.6.0`      |  1st Feb 2024 | `3.9-3.12`  | `3.0` only | `3.0` only       |

bin/build_variables.sh

@@ -19,4 +19,4 @@ MPIRVER=3.0.0 # MPIR build no longer works (not clear where to download from)
 # These are the actual dependencies used (at least by default):
 GMPVER=6.3.0
 MPFRVER=4.2.2
-FLINTVER=3.4.0
+FLINTVER=3.5.0

bin/patch-flint-windows-arm64-link-3.5.0.diff

@@ -0,0 +1,32 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8185fa609..a3822f53b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -424,22 +424,16 @@ endif
+
+ ifneq ($(SHARED), 0)
+ shared: $(FLINT_DIR)/$(FLINT_LIB_FULL)
+-# The following is to avoid reaching the maximum length of command line
+-# arguments, mainly present on MinGW.
+-define xxx_merged_lobj_rule
+-$(BUILD_DIR)/$(1)_merged.lo: $($(1)_LOBJS) | $(BUILD_DIR)
+-	@$(LD) -r $($(1)_LOBJS) -o $(BUILD_DIR)/$(1)_merged.lo
+-endef
+-$(foreach dir, $(DIRS), $(eval $(call xxx_merged_lobj_rule,$(dir))))
+-MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
+ ifeq ($(WANT_LTO),1)
+ SHARED_LIB_DEPS:=$(LOBJS)
+ else
+-SHARED_LIB_DEPS:=$(MERGED_LOBJS)
++SHARED_LINK_RSP := $(BUILD_DIR)/libflint-shared.rsp
++SHARED_LIB_DEPS:=$(LOBJS)
+ endif
+-$(FLINT_DIR)/$(FLINT_LIB_FULL): $(SHARED_LIB_DEPS)
++$(FLINT_DIR)/$(FLINT_LIB_FULL): $(SHARED_LIB_DEPS) | $(BUILD_DIR)
+ 	@echo "Building $(FLINT_LIB_FULL)"
+-	$(CMD) $(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(SHARED_LIB_DEPS) -o $(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
++	@: $(file >$(SHARED_LINK_RSP))$(foreach obj,$(LOBJS),$(file >>$(SHARED_LINK_RSP),$(obj)))
++	$(CMD) $(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) @$(SHARED_LINK_RSP) -o $(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
+ 	@$(RM_F) $(FLINT_LIB)
+ 	@$(RM_F) $(FLINT_LIB_MAJOR)
+ 	@$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)

bin/pyodide_build_dependencies.sh

@@ -109,9 +109,10 @@ else
     cd flint
 fi
 
-    # Patch needed for FLINT == 3.4.0
-    # This is https://github.com/flintlib/flint/pull/2594
-    patch -N -Z -p1 < "$SCRIPT_DIR/patch-flint-emscripten-profiler.diff"
+    # FLINT 3.4.0 needs this patch, while newer FLINT releases already have it.
+    if patch --dry-run -N -Z -p1 < "$SCRIPT_DIR/patch-flint-emscripten-profiler.diff" > /dev/null 2>&1; then
+        patch -N -Z -p1 < "$SCRIPT_DIR/patch-flint-emscripten-profiler.diff"
+    fi
 
     ./bootstrap.sh
 

doc/source/build.rst

@@ -87,7 +87,7 @@ Compatible versions:
    * - 0.9.0
      - Not yet
      - 3.11-3.14
-     - 3.0-3.4
+     - 3.0-3.5
      - 3.1-3.2?
    * - 0.8.0
      - 29th Aug 2025

meson.build

@@ -16,7 +16,7 @@ project(
 # then we can consider not using a speculative upper version cap here.
 #
 flint_lower = '>=3.0'
-flint_upper = '<3.5'
+flint_upper = '<3.6'
 cython_lower = '>=3.0.11'
 cython_upper = '<3.3'