Skip to content

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

Merged
rgommers merged 1 commit into
numpy:mainfrom
rgommers:meson-cross-patch
Aug 6, 2024
Merged

BLD: update vendored Meson for cross-compilation patches#27118
rgommers merged 1 commit into
numpy:mainfrom
rgommers:meson-cross-patch

Conversation

@rgommers

@rgommersrgommers commented Aug 6, 2024

Copy link
Copy Markdown
Member

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

@rgommersrgommers added component: build Meson Items related to the introduction of Meson as the new build system for NumPy labels Aug 6, 2024
@rgommersrgommers added this to the 2.1.0 release milestone Aug 6, 2024
@rgommers
rgommers marked this pull request as ready for review August 6, 2024 15:57
@rgommers

Copy link
Copy Markdown
MemberAuthor

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.

@rgommersrgommers changed the title WIP: BLD: update vendored Meson for cross-compilation patchesBLD: update vendored Meson for cross-compilation patchesAug 6, 2024
@rgommers
rgommers merged commit bb8cc14 into numpy:mainAug 6, 2024
@rgommers
rgommers deleted the meson-cross-patch branch August 6, 2024 16:57
@charris

Copy link
Copy Markdown
Member

Does this need a backport?

@rgommers

Copy link
Copy Markdown
MemberAuthor

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

@h-vetinari

Copy link
Copy Markdown
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
Copy Markdown
Member

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

@h-vetinari

h-vetinari commented Aug 6, 2024

Copy link
Copy Markdown
Contributor

@h-vetinarivendored-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

36 - BuildBuild related PRcomponent: buildMesonItems 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

@rgommers@charris@h-vetinari