-
-
Notifications
You must be signed in to change notification settings - Fork 487
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Meson: Improve handling of dependencies #38913
Conversation
Documentation preview for this PR (built with commit 0416a96; changes) is ready! 🎉 |
tests won't start:
The latter symbol is from |
in order for diff --git a/src/sage/rings/finite_rings/meson.build b/src/sage/rings/finite_rings/meson.build
index e81724aa5c8..f9dae256d86 100644
--- a/src/sage/rings/finite_rings/meson.build
+++ b/src/sage/rings/finite_rings/meson.build
@@ -41,7 +41,7 @@ extension_data = {
foreach name, pyx : extension_data
deps = [py_dep, cysignals, gmp]
if name == 'element_pari_ffelt'
- deps += [cypari2]
+ deps += [cypari2, pari]
elif name == 'residue_field_pari_ffelt'
deps += [cypari2]
endif
diff --git a/src/sage/rings/meson.build b/src/sage/rings/meson.build
index a06dd098c06..5ecdbeb00e0 100644
--- a/src/sage/rings/meson.build
+++ b/src/sage/rings/meson.build
@@ -124,13 +124,13 @@ extension_data = {
foreach name, pyx : extension_data
deps = [py_dep, cysignals, gmp]
if name == 'complex_arb'
- deps += [flint, mpfi]
+ deps += [flint, mpfi, gsl]
elif name == 'complex_conversion'
deps += [gsl, mpfr]
elif name == 'complex_double'
deps += [gmpy2, gsl]
elif name == 'complex_interval'
- deps += [mpfi]
+ deps += [mpfi, flint]
elif name == 'complex_mpc'
deps += [gmpy2, mpfr, mpc]
elif name == 'complex_mpfr' should I push it? I'm not 100% sure it's a correct fix. |
Thanks! This worked well. Tests are passing, except for one on python 3.11 - that looks unrelated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks for the review! |
<!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> Make the dependency declaration in the meson build files more precise and add a few missing dependencies for some files. Extracted from sagemath#38872. ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#38913 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
Make the dependency declaration in the meson build files more precise and add a few missing dependencies for some files.
Extracted from #38872.
📝 Checklist
⌛ Dependencies