Freebsd compat#2544
Merged
wiredfool merged 2 commits intopython-pillow:masterfrom May 27, 2017
melvyn-sopacua:freebsd-compat
Merged
Freebsd compat#2544wiredfool merged 2 commits intopython-pillow:masterfrom melvyn-sopacua:freebsd-compat
wiredfool merged 2 commits intopython-pillow:masterfrom
melvyn-sopacua:freebsd-compat
Conversation
When openjpeg 1.5 is installed (Calligra 2.x, for example) and OpenJPEG 2.1 is installed, the subdirectory is added twice. Since the 2nd time is ignored, it is ranked after the more general /usr/local/include and openjpeg.h from the 1.5 version is picked up. Fix this in a more general way: - If a directory is added that already is in path - But where is specified Then remove the subdir from path and insert it at the spot requested. A FIXME is added to the code bit explaining the real issue, but lack investigative spirit / time to dive down the rabbit hole.
Member
|
I've checked this on FreeBSD and it works OMM, I've also checked that it doesn't mess up on Ubuntu 14.04 with the OpenJpeg 1.5 version installed (but, we didn't error out there in Master). |
This was referenced Apr 6, 2023
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When openjpeg 1.5 is installed (Calligra 2.x, for example) and OpenJPEG 2.1 is installed, the subdirectory is added twice.
Since the 2nd time is ignored, it is ranked after the more general /usr/local/include and openjpeg.h from the 1.5 version is picked up.
Fix this in a more general way:
Then remove the subdir from path and insert it at the spot requested.
A FIXME is added to the code bit explaining the real issue, but lack investigative spirit / time to dive down the rabbit hole.
Changes proposed in this pull request: