python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-24 15:50:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324 from seanupton/master

Browse Source 
Add respective paths for C_INCLUDE_PATH, LD_RUN_PATH (rpath) to build if...
This commit is contained in:
Alex Clark ☺ 2013-08-26 12:40:15 -07:00
commit 79302b90da
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.rst
View File

@ -4,6 +4,10 @@ Changelog (Pillow)
2.2.0 (2013-10-01) 2.2.0 (2013-10-01)
------------------ ------------------
- Add respective paths for C_INCLUDE_PATH, LD_RUN_PATH (rpath) to build
if specified as environment variables.
[seanupton]
- Fix Issue #312 + gif optimize improvement - Fix Issue #312 + gif optimize improvement
[d-schmidt] [d-schmidt]

6
setup.py
View File

@ -196,6 +196,12 @@ class pil_build_ext(build_ext):
_add_directory(library_dirs, "/usr/local/lib") _add_directory(library_dirs, "/usr/local/lib")
# FIXME: check /opt/stuff directories here? # FIXME: check /opt/stuff directories here?
# include, rpath, if set as environment variables:
if os.environ.get('C_INCLUDE_PATH'):
_add_directory(include_dirs, os.environ.get('C_INCLUDE_PATH'))
if os.environ.get('LD_RUN_PATH'):
_add_directory(library_dirs, os.environ.get('LD_RUN_PATH'))
prefix = sysconfig.get_config_var("prefix") prefix = sysconfig.get_config_var("prefix")
if prefix: if prefix:
_add_directory(library_dirs, os.path.join(prefix, "lib")) _add_directory(library_dirs, os.path.join(prefix, "lib"))