python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 03:18:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1883 from wiredfool/pr_1768_alt

Browse Source 
Added --disable-osx-tcltk-framework in setup.py
This commit is contained in:
wiredfool 2016-05-23 22:40:27 +01:00
commit f0fee4bec4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/installation.rst
View File

@ -207,6 +207,10 @@ Build Options
automated build systems that configure the proper paths in the
environment variables (e.g. Buildroot).
* Build flag: ``--disable-osx-tcltk-framework``. Skips linking against
the OSX system TCL/TK frameworks for systems that have alternate
versions of the libraries installed.
* Build flag: ``--debug``. Adds a debugging flag to the include and
library search process to dump all paths searched for and found to
stdout.

5
setup.py
View File

@ -149,11 +149,14 @@ class pil_build_ext(build_ext):
('enable-%s' % x, None, 'Enable support for %s' % x) for x in feature
] + [
('disable-platform-guessing', None, 'Disable platform guessing on Linux'),
('disable-osx-tcltk-framework', None,
'Disable linking against system tcl/tk frameworks on OSX'),
('debug', None, 'Debug logging')
]
def initialize_options(self):
self.disable_platform_guessing = None
self.disable_osx_tcltk_framework = None
build_ext.initialize_options(self)
for x in self.feature:
setattr(self, 'disable_%s' % x, None)
@ -644,7 +647,7 @@ class pil_build_ext(build_ext):
define_macros=defs))
if feature.tcl and feature.tk:
if sys.platform == "darwin":
if sys.platform == "darwin" and not self.disable_osx_tcltk_framework:
# locate Tcl/Tk frameworks
frameworks = []
framework_roots = [