maint: setupext.py for freetype had a Catch case for missing ft2build.h #12321
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The error was that the path was constructed manually with '\'. This is now fixed to use os.path.join Signed-off-by: Nick Papior <nickpapior@gmail.com>
dstansby
reviewed
Sep 28, 2018
| @@ -906,7 +906,7 @@ def check(self): | |||
| try: | |||
| check_include_file(get_include_dirs(), 'ft2build.h', 'freetype') | |||
| except CheckFailed: | |||
| check_include_file(get_include_dirs(), 'freetype2\\ft2build.h', 'freetype') | |||
| check_include_file(get_include_dirs(), os.path.join('freetype2', 'ft2build.h'), 'freetype') | |||
There was a problem hiding this comment.
This block should only be executed if sys.platform is windows, but I guess the change is reasonable. Does it fix a known bug?
There was a problem hiding this comment.
No, it may also be executed IFF you don't have ft2build.h installed in /usr/include. I.e. if you install freetype in a non-default location and you want to link it using setup.cfg and basedirlist, then you have problems because freetype installs the headers in the freetype2/ directory
anntzer
approved these changes
Sep 28, 2018
dstansby
approved these changes
Sep 28, 2018
|
Where does this need backporting to? Can an approver milestone? |
|
Backporting all the way to 2.2.x as this fixes a build issue. |
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Sep 29, 2018
…atch case for missing ft2build.h
meeseeksmachine
pushed a commit
to meeseeksmachine/matplotlib
that referenced
this pull request
Sep 29, 2018
…atch case for missing ft2build.h
tacaswell
added a commit
that referenced
this pull request
Sep 29, 2018
…321-on-v2.2.x Backport PR #12321 on branch v2.2.x (maint: setupext.py for freetype had a Catch case for missing ft2build.h)
QuLogic
added a commit
that referenced
this pull request
Sep 30, 2018
…321-on-v3.0.x Backport PR #12321 on branch v3.0.x (maint: setupext.py for freetype had a Catch case for missing ft2build.h)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The error was that the path was constructed manually with '\'. This is now fixed
to use os.path.join
A very minor change in setupext.py
PR Summary
PR Checklist