Skip to content
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

Add patches for cross-compilation #16

Merged
merged 2 commits into from
Aug 6, 2024

Conversation

h-vetinari
Copy link

@h-vetinari h-vetinari commented Aug 6, 2024

For numpy/numpy#27044; as the version currently vendored in mesonbuild#13403 runs into. Backport the relevant patch (+fix-ups), plus a precursor that is itself not relevant to us (it's for D), but avoids having to do conflict-resolution.

This corresponds to the patches we're also currently carrying in the numpy-feedstock in conda-forge.

Axel Ricard and others added 2 commits August 6, 2024 13:38
If need_exe_wrapper() is called while figuring out the language compiler,
the MachineInfo isn't complete yet, so machine_info_can_run() would return
False despite not cross compiling.

Make sure this fails loudly.

Squash of the following cherry-picked commits:
- mesonbuild@df833b0
- mesonbuild@c108d5b
- mesonbuild@eba9e7e
@h-vetinari h-vetinari changed the title Add patches for cross-compilatiton Add patches for cross-compilation Aug 6, 2024
Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @h-vetinari!

This LGTM and CI at numpy/numpy#27118 is happy with this. CI failures on this repo are unrelated.

@rgommers rgommers merged commit 6f88e48 into numpy:main-numpymeson Aug 6, 2024
4 of 27 checks passed
@h-vetinari h-vetinari deleted the cross branch August 6, 2024 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants