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

BLD: update vendored Meson for cross-compilation patches #27118

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

rgommers
Copy link
Member

@rgommers rgommers commented Aug 6, 2024

Pulls in numpy/meson#16 from our Meson fork for 2.1.0 (xref gh-27044). A full update to Meson 1.5.1 won't make it in in time for 2.1.0, so this is helpful.

Draft PR to test in CI before merging numpy/meson#16

@rgommers rgommers added component: build Meson Items related to the introduction of Meson as the new build system for NumPy labels Aug 6, 2024
@rgommers rgommers added this to the 2.1.0 release milestone Aug 6, 2024
@rgommers rgommers force-pushed the meson-cross-patch branch from 6e4fa28 to ccf67e3 Compare August 6, 2024 15:57
@rgommers rgommers marked this pull request as ready for review August 6, 2024 15:57
@rgommers
Copy link
Member Author

rgommers commented Aug 6, 2024

This is integrating a change conda-forge would like before the 2.1.x branch creation. CI is happy, so I'll go ahead and merge straight away.

@rgommers rgommers changed the title WIP: BLD: update vendored Meson for cross-compilation patches BLD: update vendored Meson for cross-compilation patches Aug 6, 2024
@rgommers rgommers merged commit bb8cc14 into numpy:main Aug 6, 2024
66 checks passed
@rgommers rgommers deleted the meson-cross-patch branch August 6, 2024 16:57
@charris
Copy link
Member

charris commented Aug 6, 2024

Does this need a backport?

@rgommers
Copy link
Member Author

rgommers commented Aug 6, 2024

To 2.0.x? I didn't consider that yet. Not sure - @h-vetinari?

@h-vetinari
Copy link
Contributor

If there's a chance for a 2.0.2, I think it should be backported. If someone creates a branch at the commit in numpy/meson that's currently in 2.0.x, I can do the same backport there.

@charris
Copy link
Member

charris commented Aug 6, 2024

@h-vetinari vendored-meson/meson is a submodule, nothing special needed.

@h-vetinari
Copy link
Contributor

h-vetinari commented Aug 6, 2024

@h-vetinari vendored-meson/meson is a submodule, nothing special needed.

I get the submodule part, but I had falsely assumed that the vendored meson had already diverged between 2.0.x and main (and in that case it would have been necessary to either point to the same submodule commit as main, or backport the patches to the meson commit that 2.0.x pointed to in that hypothetical scenario)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
36 - Build Build related PR component: build Meson Items related to the introduction of Meson as the new build system for NumPy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants