diff options
Diffstat (limited to 'Library/Formula/python.rb')
| -rw-r--r-- | Library/Formula/python.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb index 02c5ba2d0..6425261ce 100644 --- a/Library/Formula/python.rb +++ b/Library/Formula/python.rb @@ -111,7 +111,7 @@ class Python < Formula # HAVE_POLL is "broken" on OS X # See: http://trac.macports.org/ticket/18376 and http://bugs.python.org/issue5154 - inreplace 'pyconfig.h', /.*?(HAVE_POLL[_A-Z]*).*/, '#undef \1' unless build.with? "poll" + inreplace 'pyconfig.h', /.*?(HAVE_POLL[_A-Z]*).*/, '#undef \1' if build.without? "poll" system "make" @@ -328,7 +328,7 @@ index 716f08e..66114ef 100644 - 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 @@ -1858,21 +1855,6 @@ class PyBuildExt(build_ext): @@ -350,16 +350,16 @@ index 716f08e..66114ef 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 host_platform == 'cygwin': @@ -1897,9 +1879,6 @@ class PyBuildExt(build_ext): if host_platform in ['aix3', 'aix4']: libs.append('ld') - + - # Finally, link with the X11 libraries (not appropriate on cygwin) - if host_platform != "cygwin": - libs.append('X11') - + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], define_macros=[('WITH_APPINIT', 1)] + defs, |