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

Enable GCC to find free-threaded python DLL library #13851

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

andfoy
Copy link
Contributor

@andfoy andfoy commented Oct 31, 2024

This fixes a case not covered in PR #13338, which causes Meson not to locate the Python free-threaded DLL libraries, whose suffix ends in t when using GCC.

cc @rgommers

@andfoy andfoy requested a review from jpakkane as a code owner October 31, 2024 17:40
Copy link
Contributor

@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 for this fix @andfoy! This is clearly correct, not sure how I missed that in the previous PR. The one CI failure is clearly unrelated, so this should be good to merge.

I re-checked this whole function, and there is also:

            if self.static:
                libpath = Path('libs') / f'libpython{vernum}.a'

That doesn't seem to be used though. The official CPython installer only contains libpython313.lib and libpython313t.lib, no .a. The if-else could be added there too, or left out until there's a use case, no strong opinions either way.

I'll add the need for CI to gh-13263 (and work on that issue); we already discussed whether to test with MinGW in addition to MSVC there.

This does fix the SciPy wheel build on Windows, which uses MinGW, so it'd be great to get this in and backported for Meson 1.6.1.

@eli-schwartz eli-schwartz merged commit 4ac3e7d into mesonbuild:master Nov 1, 2024
32 of 33 checks passed
@andfoy andfoy deleted the locate_free_threaded_gcc branch November 1, 2024 14:03
@eli-schwartz eli-schwartz added this to the 1.6.1 milestone Nov 5, 2024
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