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

Avoid collecting Wine built-in DLLs [v4 backport] #6623

Merged
merged 1 commit into from Feb 24, 2022

Conversation

rokm
Copy link
Member

@rokm rokm commented Feb 24, 2022

Back-port of #6149. But because it has been a while, this gets its own PR with its own news entry number.

Closes #6621.

Back-port of pyinstaller#6149 to the v4 branch.

* compat: implement detection of Wine environment and Wine DLLs

Add a new flag, is_win_wine, which indicates that we are running
under Wine.

Implement a new function, is_wine_dll(), which checks if the given
file is a Wine build-in DLL (PE-converted or fake/placeholder).

* depend: automatically exclude Wine built-in DLLs

Automatically exclude Wine built-in DLLs, regardless of the exclude
and include lists. Wine built-in DLLs are likely to cause problems
under Windows, so excluding them increases the chances of the bundle
working under Windows. On the other hand, even with Wine DLLs excluded,
the bundle should still run under Wine as before.

* depend: display each excluded-Wine-DLL warning only once
@bwoodsend bwoodsend merged commit e691fb9 into pyinstaller:v4 Feb 24, 2022
@rokm rokm deleted the backport-6149-to-v4 branch February 24, 2022 21:39
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants