diff options
| author | Brett Koonce | 2013-04-07 07:21:50 -0500 |
|---|---|---|
| committer | Samuel John | 2013-04-07 19:13:32 +0200 |
| commit | 97c0e0dd2c4f4377f7b658d294c2d33a54f752fb (patch) | |
| tree | 9bb42b48cc2c17dc5c8a210adea9e733d87994ae /Library/Formula | |
| parent | 10ba101c323f98118b427f291e15abc5b3732991 (diff) | |
| download | homebrew-97c0e0dd2c4f4377f7b658d294c2d33a54f752fb.tar.bz2 | |
python: tweak tk patch for python 2.7.4
Closes #19026. Fixes #19020 (half-of)
Signed-off-by: Samuel John <github@SamuelJohn.de>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/python.rb | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb index 8cff7e0f2..c03cd817f 100644 --- a/Library/Formula/python.rb +++ b/Library/Formula/python.rb @@ -273,21 +273,22 @@ end __END__ diff --git a/setup.py b/setup.py -index 6b47451..36bc81d 100644 +index ea8a5f5..0a001f9 100644 --- a/setup.py +++ b/setup.py -@@ -1702,9 +1702,6 @@ class PyBuildExt(build_ext): +@@ -1809,9 +1809,7 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building # AquaTk is a separate method. Only one Tkinter will be built on # Darwin - either AquaTk, if it is found, or X11 based Tk. - platform = self.get_platform() -- if (platform == 'darwin' and +- if (host_platform == 'darwin' and - self.detect_tkinter_darwin(inc_dirs, lib_dirs)): - return ++ # Assume we haven't found any of the libraries or include files # The versions with dots are used on Unix, and the versions without -@@ -1754,17 +1751,6 @@ class PyBuildExt(build_ext): - if platform == 'sunos5': +@@ -1861,17 +1859,7 @@ class PyBuildExt(build_ext): + if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') added_lib_dirs.append('/usr/openwin/lib') - elif os.path.exists('/usr/X11R6/include'): @@ -301,17 +302,18 @@ index 6b47451..36bc81d 100644 - # Assume default location for X11 - include_dirs.append('/usr/X11/include') - added_lib_dirs.append('/usr/X11/lib') ++ # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': -@@ -1790,8 +1776,8 @@ class PyBuildExt(build_ext): + if host_platform == 'cygwin': +@@ -1897,8 +1885,8 @@ class PyBuildExt(build_ext): libs.append('ld') # Finally, link with the X11 libraries (not appropriate on cygwin) -- if platform != "cygwin": +- if host_platform != "cygwin": - libs.append('X11') -+ # if platform != "cygwin": -+ # libs.append('X11') ++ # if host_platform != "cygwin": ++ # libs.append('X11') ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], define_macros=[('WITH_APPINIT', 1)] + defs, |