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

Freebsd compat #2544

Merged
merged 2 commits into from
May 27, 2017
Merged

Freebsd compat #2544

merged 2 commits into from
May 27, 2017

Conversation

melvyn-sopacua
Copy link
Contributor

@melvyn-sopacua melvyn-sopacua commented May 26, 2017

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.

Changes proposed in this pull request:

  • See above

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.
@wiredfool wiredfool merged commit 08fea6b into python-pillow:master May 27, 2017
@wiredfool
Copy link
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).

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.

None yet

2 participants