python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 17:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2544 from melvyn-sopacua/freebsd-compat

Browse Source 
Ignore openjpeg 1.5 on FreeBSD
This commit is contained in:
wiredfool 2017-05-27 14:32:10 +01:00 committed by GitHub
commit 08fea6b881
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup.py
View File

@ -63,6 +63,9 @@ def _add_directory(path, subdir, where=None):
else: else:
_dbg('Inserting path %s', subdir) _dbg('Inserting path %s', subdir)
path.insert(where, subdir) path.insert(where, subdir)
elif subdir in path and where is not None:
path.remove(subdir)
path.insert(where, subdir)
def _find_include_file(self, include): def _find_include_file(self, include):
@ -462,6 +465,10 @@ class pil_build_ext(build_ext):
# Add the directory to the include path so we can include # Add the directory to the include path so we can include
# <openjpeg.h> rather than having to cope with the versioned # <openjpeg.h> rather than having to cope with the versioned
# include path # include path
# FIXME (melvyn-sopacua):
# At this point it's possible that best_path is already in
# self.compiler.include_dirs. Should investigate how that is
# possible.
_add_directory(self.compiler.include_dirs, best_path, 0) _add_directory(self.compiler.include_dirs, best_path, 0)
feature.jpeg2000 = 'openjp2' feature.jpeg2000 = 'openjp2'
feature.openjpeg_version = '.'.join(str(x) for x in best_version) feature.openjpeg_version = '.'.join(str(x) for x in best_version)