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

Merge pull request #466 from dmckeone/patch-2

Browse Source 
Prefer homebrew freetype over X11 freetype (but still allow both)
This commit is contained in:
Alex Clark ☺ 2014-01-01 14:49:01 -08:00
commit 7bc9a1a3f9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
setup.py
View File

@ -201,9 +201,7 @@ class pil_build_ext(build_ext):
# darwin ports installation directories # darwin ports installation directories
_add_directory(library_dirs, "/opt/local/lib") _add_directory(library_dirs, "/opt/local/lib")
_add_directory(include_dirs, "/opt/local/include") _add_directory(include_dirs, "/opt/local/include")
# freetype2 ships with X11
_add_directory(library_dirs, "/usr/X11/lib")
_add_directory(include_dirs, "/usr/X11/include")
# if homebrew is installed, use its lib and include directories # if homebrew is installed, use its lib and include directories
import subprocess import subprocess
try: try:
@ -212,8 +210,16 @@ class pil_build_ext(build_ext):
prefix = prefix.strip() prefix = prefix.strip()
_add_directory(library_dirs, os.path.join(prefix, 'lib')) _add_directory(library_dirs, os.path.join(prefix, 'lib'))
_add_directory(include_dirs, os.path.join(prefix, 'include')) _add_directory(include_dirs, os.path.join(prefix, 'include'))
# freetype2 is a key-only brew under opt/
_add_directory(library_dirs, os.path.join(prefix, 'opt', 'freetype', 'lib'))
_add_directory(include_dirs, os.path.join(prefix, 'opt', 'freetype', 'include'))
except: except:
pass # homebrew not installed pass # homebrew not installed
# freetype2 ships with X11 (after homebrew, so that homebrew freetype is preferred)
_add_directory(library_dirs, "/usr/X11/lib")
_add_directory(include_dirs, "/usr/X11/include")
elif sys.platform.startswith("linux"): elif sys.platform.startswith("linux"):
for platform_ in (plat.processor(), plat.architecture()[0]): for platform_ in (plat.processor(), plat.architecture()[0]):