python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-10 16:22:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3395 from diorcety/improve_configuration

Browse Source 
Improve configuration
This commit is contained in:
Hugo 2018-12-26 13:54:16 +02:00 committed by GitHub
commit c2b3bd5635
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
setup.py
View File

@ -147,15 +147,20 @@ LCMS_ROOT = None
def _pkg_config(name): def _pkg_config(name):
try: try:
command = [ command_libs = [
'pkg-config', 'pkg-config',
'--libs-only-L', name, '--libs-only-L', name,
]
command_cflags = [
'pkg-config',
'--cflags-only-I', name, '--cflags-only-I', name,
] ]
if not DEBUG: if not DEBUG:
command.append('--silence-errors') command_libs.append('--silence-errors')
libs = subprocess.check_output(command).decode('utf8').split(' ') command_cflags.append('--silence-errors')
return libs[1][2:].strip(), libs[0][2:].strip() libs = subprocess.check_output(command_libs).decode('utf8').strip().replace('-L', '')
cflags = subprocess.check_output(command_cflags).decode('utf8').strip().replace('-I', '')
return (libs, cflags)
except Exception: except Exception:
pass pass
@ -247,6 +252,11 @@ class pil_build_ext(build_ext):
IMAGEQUANT_ROOT="libimagequant" IMAGEQUANT_ROOT="libimagequant"
).items(): ).items():
root = globals()[root_name] root = globals()[root_name]
if root is None and root_name in os.environ:
prefix = os.environ[root_name]
root = (os.path.join(prefix, 'lib'), os.path.join(prefix, 'include'))
if root is None and pkg_config: if root is None and pkg_config:
if isinstance(lib_name, tuple): if isinstance(lib_name, tuple):
for lib_name2 in lib_name: for lib_name2 in lib_name: