Repository navigation
Meson: reject incompatible eclib and fall back to 20250627 - #42982
Merged
Merged
Conversation
|
Documentation preview for this PR (built with commit bdbfc73; changes) is ready! 🎉 |
Member
Author
|
@tobiasdiez - look at the wrap for eclib written here. Looks like we can do all the potentially needed deps this way now... |
Contributor
Awesome! I had the hope that something along those lines indeed works for most deps, but its good to have the confirmation! In my opinion, it is definitely the cleaner approach than what is currently in sage-the-distro. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Meson currently accepts any eclib version >=20231211. With Debian forky's eclib 20260707-3, it selects an API that Sage's bindings do not support:
scalaris now anINTclass, modular-symbol constructors and methods changed, and the newer headers also expose PARI namespace/signal-header errors. This caused the Debian job failure on #42960.Limit system eclib to the API supported through 20250627 and add a Meson fallback to that version, using the same upstream release archive and SHA-256 as Sage's SPKG. The existing lower bound is retained for compatible conda packages that report an older pkg-config version. Enable fallback for the default
autofeature so an incompatible or missing system library does not simply remove eclib functionality; preserve explicit feature disabling and Meson's fallback controls. Automatic fallback stays off on Windows, where PARI is unavailable.The overlay builds the upstream library's 78 compilation units with FLINT and NTL multiprecision, without Boost threading, matching the SPKG configuration. A shared library keeps eclib's state common to Sage's four extension modules. This PR changes dependency selection, without adapting the bindings to the newer API.
Validation:
homspace.pyx,mat.pyx,mwrank.pyx,newforms.pyx, andinterface.py, with import paths verified to use the newly built modules.libec16.python3 build/test/test_eclib_meson.py -v: seven regression tests covering compatible/incompatible/missing system metadata, feature disabling/enabling, forced/forbidden fallback, and the Windows selection policy. These selection tests use fixtures and do not download or compile eclib.git diff --checkpassed.The local checks cover the dependency and bindings; they are not a complete Sage rebuild.
📝 Checklist
⌛ Dependencies
None. Based directly on
develop; independent of #42960.