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

Ensure internal FreeType matches Python compile #21263

Merged
merged 2 commits into from
Oct 4, 2021

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Oct 1, 2021

PR Summary

Pass along a few options to ensure that FreeType doesn't end up with a mixed compiler or bit-ness compared to the rest of the compiled ft2font extension.

PR Checklist

  • [n/a] Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • [n/a] New features are documented, with examples if plot related.
  • [n/a] Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • [n/a] New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

Otherwise, mixed compilers might break things when compiled together
into the extension.

Fixes matplotlib#21202
This should fix 32-bit compiles on a 64-bit system, as in matplotlib#18113, but I
could never get a working 32-bit Python to test.
@QuLogic QuLogic added the Build label Oct 1, 2021
@QuLogic QuLogic added this to the v3.5.0 milestone Oct 1, 2021
@tacaswell
Copy link
Member

tacaswell commented Oct 2, 2021

Will this fix the recently reported issues with freeBSD + clang?

@jklymak
Copy link
Member

jklymak commented Oct 4, 2021

Feel free to merge if @tacaswell question is addressed...

@QuLogic
Copy link
Member Author

QuLogic commented Oct 4, 2021

Yes, see commit messages.

@QuLogic QuLogic merged commit e01d4f1 into matplotlib:master Oct 4, 2021
@QuLogic QuLogic deleted the better-freetype-compile branch October 4, 2021 20:34
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Oct 4, 2021
@QuLogic QuLogic mentioned this pull request Oct 5, 2021
1 task
QuLogic added a commit that referenced this pull request Oct 6, 2021
…263-on-v3.5.x

Backport PR #21263 on branch v3.5.x (Ensure internal FreeType matches Python compile)
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Oct 12, 2021
Ensure internal FreeType matches Python compile
tacaswell pushed a commit that referenced this pull request Oct 20, 2021
Ensure internal FreeType matches Python compile
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants