From: Aaron Askew Date: Sun, 19 Oct 2014 15:30:06 +0000 (-0600) Subject: Updated homebrew python formula to newest official and changed MACOSX_DEPLOYMENT_TARG... X-Git-Tag: 14.09-1.18~107^2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e72aecacd51a7c12949a57c02f7977aec591373a;p=cura.git Updated homebrew python formula to newest official and changed MACOSX_DEPLOYMENT_TARGET to 10.6 --- diff --git a/scripts/darwin/python.rb b/scripts/darwin/python.rb index 71e24fae..dfb2b91a 100644 --- a/scripts/darwin/python.rb +++ b/scripts/darwin/python.rb @@ -1,48 +1,79 @@ -require 'formula' - -class Distribute < Formula - url 'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.34.tar.gz' - sha1 'b6f9cfbaf3e63833b71009812a613be13e68f5de' -end - -class Pip < Formula - url 'http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz' - sha1 '35db84983ef3f66a8a161d320e61d192afc233d9' -end +Skip to content + This repository +Explore +Gist +Blog +Help +aaronaskew aaronaskew + +3 Unwatch + Star 1 + Fork 245alephobjects/Cura +forked from daid/Cura + branch: SteamEngine Cura / scripts / darwin / python.rb +aaronaskewaaronaskew 14 hours ago Updated homebrew python formula to newest official and changed MACOSX… +2 contributors Ilya Kulakovaaronaskew +383 lines (324 sloc) 15.644 kb RawBlameHistory +require "formula" class Python < Formula - homepage 'http://www.python.org' - url 'http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2' - sha1 '842c4e2aff3f016feea3c6e992c7fa96e49c9aa0' + homepage "https://www.python.org" + head "https://hg.python.org/cpython", :using => :hg, :branch => "2.7" + url "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz" + sha1 "511960dd78451a06c9df76509635aeec05b2051a" + revision 2 + + bottle do + sha1 "b84f255563bb7c86c15329b534d64ab2c8fcb7ba" => :mavericks + sha1 "8921690c3c855ab0a06c76d8c4a2cdf9702b9fdb" => :mountain_lion + sha1 "61d735d94ae8e84c9fdc3bba2af16233aaabda29" => :lion + end option :universal - option 'quicktest', 'Run `make quicktest` after the build' - option 'with-brewed-openssl', "Use Homebrew's openSSL instead of the one from OS X" - option 'with-brewed-tk', "Use Homebrew's Tk (has optional Cocoa and threads support)" - option 'with-poll', 'Enable select.poll, which is not fully implemented on OS X (http://bugs.python.org/issue5154)' - # --with-dtrace relies on CLT as dtrace hard-codes paths to /usr - option 'with-dtrace', 'Experimental DTrace support (http://bugs.python.org/issue13405)' if MacOS::CLT.installed? - - depends_on 'pkg-config' => :build - depends_on 'readline' => :recommended - depends_on 'sqlite' => :recommended - depends_on 'gdbm' => :recommended - depends_on 'openssl' if build.include? 'with-brewed-openssl' - depends_on 'homebrew/dupes/tk' if build.include? 'with-brewed-tk' - - def patches - p = [] - # python fails to build on NFS; patch is merged upstream, will be in next release - # see http://bugs.python.org/issue14662 - p << "https://gist.github.com/raw/4349132/25662c6b382315b5db67bf949773d76471bbcee7/python-nfs-shutil.diff" - p << 'https://raw.github.com/gist/3415636/2365dea8dc5415daa0148e98c394345e1191e4aa/pythondtrace-patch.diff' if build.include? 'with-dtrace' - # Patch to disable the search for Tk.frameworked, since homebrew's Tk is a plain unix build - p << DATA if build.include? 'with-brewed-tk' - p + option "quicktest", "Run `make quicktest` after the build (for devs; may fail)" + option "with-brewed-tk", "Use Homebrew's Tk (has optional Cocoa and threads support)" + option "with-poll", "Enable select.poll, which is not fully implemented on OS X (http://bugs.python.org/issue5154)" + option "with-dtrace", "Experimental DTrace support (http://bugs.python.org/issue13405)" + + depends_on "pkg-config" => :build + depends_on "readline" => :recommended + depends_on "sqlite" => :recommended + depends_on "gdbm" => :recommended + depends_on "openssl" + depends_on "homebrew/dupes/tcl-tk" if build.with? "brewed-tk" + depends_on :x11 if build.with? "brewed-tk" and Tab.for_name("tcl-tk").with? "x11" + + skip_clean "bin/pip", "bin/pip-2.7" + skip_clean "bin/easy_install", "bin/easy_install-2.7" + + resource "setuptools" do + url "https://pypi.python.org/packages/source/s/setuptools/setuptools-5.4.2.tar.gz" + sha1 "a681ba56c30c0eb66528215842d3e3fcb5157614" + end + + resource "pip" do + url "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz" + sha1 "e6cd9e6f2fd8d28c9976313632ef8aa8ac31249e" + end + + # Patch for pyport.h macro issue + # http://bugs.python.org/issue10910 + # https://trac.macports.org/ticket/44288 + patch do + url "http://bugs.python.org/file30805/issue10910-workaround.txt" + sha1 "9926640cb7c8e273e4b451469a2b13d4b9df5ba3" + end + + # Patch to disable the search for Tk.framework, since Homebrew's Tk is + # a plain unix build. Remove `-lX11`, too because our Tk is "AquaTk". + patch :DATA if build.with? "brewed-tk" + + def lib_cellar + prefix/"Frameworks/Python.framework/Versions/2.7/lib/python2.7" end def site_packages_cellar - prefix/"Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages" + lib_cellar/"site-packages" end # The HOMEBREW_PREFIX location of site-packages. @@ -50,30 +81,32 @@ class Python < Formula HOMEBREW_PREFIX/"lib/python2.7/site-packages" end - # Where distribute/pip will install executable scripts. - def scripts_folder - HOMEBREW_PREFIX/"share/python" + # setuptools remembers the build flags python is built with and uses them to + # build packages later. Xcode-only systems need different flags. + def pour_bottle? + MacOS::CLT.installed? end def install - opoo 'The given option --with-poll enables a somewhat broken poll() on OS X (http://bugs.python.org/issue5154).' if build.include? 'with-poll' + if build.with? "poll" + opoo "The given option --with-poll enables a somewhat broken poll() on OS X (http://bugs.python.org/issue5154)." + end - # Unset these so that installing pip and distribute puts them where we want + # Unset these so that installing pip and setuptools puts them where we want # and not into some other Python the user has installed. - ENV['PYTHONPATH'] = nil - ENV['PYTHONHOME'] = nil + ENV["PYTHONHOME"] = nil + ENV["PYTHONPATH"] = nil args = %W[ --prefix=#{prefix} --enable-ipv6 --datarootdir=#{share} --datadir=#{share} - --enable-framework=#{prefix}/Frameworks - MACOSX_DEPLOYMENT_TARGET=10.6 + --enable-framework=#{frameworks} ] - args << '--without-gcc' if ENV.compiler == :clang - args << '--with-dtrace' if build.include? 'with-dtrace' + args << "--without-gcc" if ENV.compiler == :clang + args << "--with-dtrace" if build.with? "dtrace" if superenv? distutils_fix_superenv(args) @@ -86,117 +119,132 @@ class Python < Formula args << "--enable-universalsdk=/" << "--with-universal-archs=intel" end - # Allow sqlite3 module to load extensions: http://docs.python.org/library/sqlite3.html#f1 - inreplace "setup.py", 'sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))', '' + # Allow sqlite3 module to load extensions: + # http://docs.python.org/library/sqlite3.html#f1 + if build.with? "sqlite" + inreplace("setup.py", 'sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))', '') + end + + # Allow python modules to use ctypes.find_library to find homebrew's stuff + # even if homebrew is not a /usr/local/lib. Try this with: + # `brew install enchant && pip install pyenchant` + inreplace "./Lib/ctypes/macholib/dyld.py" do |f| + f.gsub! 'DEFAULT_LIBRARY_FALLBACK = [', "DEFAULT_LIBRARY_FALLBACK = [ '#{HOMEBREW_PREFIX}/lib'," + f.gsub! 'DEFAULT_FRAMEWORK_FALLBACK = [', "DEFAULT_FRAMEWORK_FALLBACK = [ '#{HOMEBREW_PREFIX}/Frameworks'," + end + + if build.with? "brewed-tk" + tcl_tk = Formula["tcl-tk"].opt_prefix + ENV.append "CPPFLAGS", "-I#{tcl_tk}/include" + ENV.append "LDFLAGS", "-L#{tcl_tk}/lib" + end system "./configure", *args - # 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.include? "with-poll" + # HAVE_POLL is "broken" on OS X. See: + # http://trac.macports.org/ticket/18376 + # http://bugs.python.org/issue5154 + if build.without? "poll" + inreplace "pyconfig.h", /.*?(HAVE_POLL[_A-Z]*).*/, '#undef \1' + end system "make" - ENV.deparallelize # Installs must be serialized - # Tell Python not to install into /Applications (default for framework builds) + ENV.deparallelize # installs must be serialized + # Tell Python not to install into /Applications system "make", "install", "PYTHONAPPSDIR=#{prefix}" # Demos and Tools - (HOMEBREW_PREFIX/'share/python').mkpath system "make", "frameworkinstallextras", "PYTHONAPPSDIR=#{share}/python" system "make", "quicktest" if build.include? 'quicktest' - # Post-install, fix up the site-packages and install-scripts folders - # so that user-installed Python software survives minor updates, such - # as going from 2.7.0 to 2.7.1: + # Fixes setting Python build flags for certain software + # See: https://github.com/Homebrew/homebrew/pull/20182 + # http://bugs.python.org/issue3588 + inreplace lib_cellar/"config/Makefile" do |s| + s.change_make_var! "LINKFORSHARED", + "-u _PyMac_Error $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)" + end # Remove the site-packages that Python created in its Cellar. site_packages_cellar.rmtree - # Create a site-packages in HOMEBREW_PREFIX/lib/python/site-packages + + (libexec/'setuptools').install resource('setuptools') + (libexec/'pip').install resource('pip') + end + + def post_install + # Fix up the site-packages so that user-installed Python software survives + # minor updates, such as going from 2.7.0 to 2.7.1: + + # Create a site-packages in HOMEBREW_PREFIX/lib/python2.7/site-packages site_packages.mkpath + # Symlink the prefix site-packages into the cellar. - ln_s site_packages, site_packages_cellar - - # Teach python not to use things from /System - # and tell it about the correct site-package dir because we moved it - sitecustomize = site_packages_cellar/"sitecustomize.py" - rm sitecustomize if File.exist? sitecustomize - sitecustomize.write <<-EOF.undent - # This file is created by `brew install python` and is executed on each - # python startup. Don't print from here, or else universe will collapse. - import sys - import site - - # Only do fix 1 and 2, if the currently run python is a brewed one. - if sys.executable.startswith('#{HOMEBREW_PREFIX}'): - # Fix 1) - # A setuptools.pth and/or easy-install.pth sitting either in - # /Library/Python/2.7/site-packages or in - # ~/Library/Python/2.7/site-packages can inject the - # /System's Python site-packages. People then report - # "OSError: [Errno 13] Permission denied" because pip/easy_install - # attempts to install into - # /System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python - # See: https://github.com/mxcl/homebrew/issues/14712 - sys.path = [ p for p in sys.path if not p.startswith('/System') ] - - # Fix 2) - # Remove brewed Python's hard-coded site-packages - sys.path.remove('#{site_packages_cellar}') - - # Fix 3) - # For all Pythons: Tell about homebrew's site-packages location. - # This is needed for Python to parse *.pth files. - site.addsitedir('#{site_packages}') - EOF + site_packages_cellar.unlink if site_packages_cellar.exist? + site_packages_cellar.parent.install_symlink site_packages + + # Write our sitecustomize.py + rm_rf Dir["#{site_packages}/sitecustomize.py[co]"] + (site_packages/"sitecustomize.py").atomic_write(sitecustomize) + + # Remove old setuptools installations that may still fly around and be + # listed in the easy_install.pth. This can break setuptools build with + # zipimport.ZipImportError: bad local file header + # setuptools-0.9.5-py3.3.egg + rm_rf Dir["#{site_packages}/setuptools*"] + rm_rf Dir["#{site_packages}/distribute*"] + + setup_args = ["-s", "setup.py", "--no-user-cfg", "install", "--force", + "--verbose", + "--install-scripts=#{bin}", + "--install-lib=#{site_packages}"] + + (libexec/"setuptools").cd { system "#{bin}/python", *setup_args } + (libexec/"pip").cd { system "#{bin}/python", *setup_args } + + # When building from source, these symlinks will not exist, since + # post_install happens after linking. + %w[pip pip2 pip2.7 easy_install easy_install-2.7].each do |e| + (HOMEBREW_PREFIX/"bin").install_symlink bin/e + end - # Install distribute and pip - # It's important to have these installers in our bin, because some users - # forget to put #{script_folder} in PATH, then easy_install'ing - # into /Library/Python/X.Y/site-packages with /usr/bin/easy_install. - mkdir_p scripts_folder unless scripts_folder.exist? - setup_args = ["-s", "setup.py", "--no-user-cfg", "install", "--force", "--verbose", "--install-lib=#{site_packages_cellar}", "--install-scripts=#{bin}" ] - Distribute.new.brew { system "#{bin}/python", *setup_args } - Pip.new.brew { system "#{bin}/python", *setup_args } - - # Tell distutils-based installers where to put scripts and python modules - (prefix/"Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/distutils.cfg").write <<-EOF.undent + # And now we write the distutils.cfg + cfg = lib_cellar/"distutils/distutils.cfg" + cfg.atomic_write <<-EOF.undent + [global] + verbose=1 [install] - install-scripts=#{scripts_folder} - install-lib=#{site_packages} + force=1 + prefix=#{HOMEBREW_PREFIX} EOF - - makefile = prefix/'Frameworks/Python.framework/Versions/2.7/lib/python2.7/config/Makefile' - inreplace makefile do |s| - unless MacOS::CLT.installed? - s.gsub!(/^CC=.*$/, "CC=xcrun clang") - s.gsub!(/^CXX=.*$/, "CXX=xcrun clang++") - s.gsub!(/^AR=.*$/, "AR=xcrun ar") - s.gsub!(/^RANLIB=.*$/, "RANLIB=xcrun ranlib") - end - # Should be fixed regardless of CLT (for `python-config --ldflags`) - s.gsub!(/^PYTHONFRAMEWORKDIR=\tPython\.framework/, "PYTHONFRAMEWORKDIR= #{opt_prefix}/Frameworks/Python.framework") - end - end def distutils_fix_superenv(args) - # To allow certain Python bindings to find brewed software: - cflags = "CFLAGS=-msse2 -mno-sse3 -mno-sse4 -I#{HOMEBREW_PREFIX}/include -I#{Formula.factory('sqlite').opt_prefix}/include" - ldflags = "LDFLAGS=-L#{HOMEBREW_PREFIX}/lib -L#{Formula.factory('sqlite').opt_prefix}/lib" + # This is not for building python itself but to allow Python's build tools + # (pip) to find brewed stuff when installing python packages. + sqlite = Formula["sqlite"].opt_prefix + cflags = "CFLAGS=-I#{HOMEBREW_PREFIX}/include -I#{sqlite}/include" + ldflags = "LDFLAGS=-L#{HOMEBREW_PREFIX}/lib -L#{sqlite}/lib" + if build.with? "brewed-tk" + tcl_tk = Formula["tcl-tk"].opt_prefix + cflags += " -I#{tcl_tk}/include" + ldflags += " -L#{tcl_tk}/lib" + end unless MacOS::CLT.installed? - # Help Python's build system (distribute/pip) to build things on Xcode-only systems + # Help Python's build system (setuptools/pip) to build things on Xcode-only systems # The setup.py looks at "-isysroot" to get the sysroot (and not at --sysroot) cflags += " -isysroot #{MacOS.sdk_path}" ldflags += " -isysroot #{MacOS.sdk_path}" - # Same zlib.h-not-found-bug as in env :std (see below) - args << "CPPFLAGS=-I#{MacOS.sdk_path}/usr/include" + args << "CPPFLAGS=-I#{MacOS.sdk_path}/usr/include" # find zlib # For the Xlib.h, Python needs this header dir with the system Tk - unless build.include? 'with-brewed-tk' + if build.without? "brewed-tk" cflags += " -I#{MacOS.sdk_path}/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers" end end args << cflags args << ldflags + # Avoid linking to libgcc http://code.activestate.com/lists/python-dev/112195/ + args << "MACOSX_DEPLOYMENT_TARGET=10.6" # We want our readline! This is just to outsmart the detection code, # superenv handles that cc finds includes/libs! inreplace "setup.py", @@ -204,61 +252,95 @@ class Python < Formula "do_readline = '#{HOMEBREW_PREFIX}/opt/readline/lib/libhistory.dylib'" end - def distutils_fix_stdenv() + def distutils_fix_stdenv # Python scans all "-I" dirs but not "-isysroot", so we add # the needed includes with "-I" here to avoid this err: # building dbm using ndbm # error: /usr/include/zlib.h: No such file or directory - ENV.append 'CPPFLAGS', "-I#{MacOS.sdk_path}/usr/include" unless MacOS::CLT.installed? - ENV.append_to_cflags '-msse2 -mno-sse3 -mno-sse4' + ENV.append "CPPFLAGS", "-I#{MacOS.sdk_path}/usr/include" unless MacOS::CLT.installed? # Don't use optimizations other than "-Os" here, because Python's distutils - # remembers (hint: `python3-config --cflags`) and reuses them for C + # remembers (hint: `python-config --cflags`) and reuses them for C # extensions which can break software (such as scipy 0.11 fails when # "-msse4" is present.) ENV.minimal_optimization # We need to enable warnings because the configure.in uses -Werror to detect - # "whether gcc supports ParseTuple" (https://github.com/mxcl/homebrew/issues/12194) + # "whether gcc supports ParseTuple" (https://github.com/Homebrew/homebrew/issues/12194) ENV.enable_warnings if ENV.compiler == :clang # http://docs.python.org/devguide/setup.html#id8 suggests to disable some Warnings. - ENV.append_to_cflags '-Wno-unused-value' - ENV.append_to_cflags '-Wno-empty-body' - ENV.append_to_cflags '-Qunused-arguments' + ENV.append_to_cflags "-Wno-unused-value" + ENV.append_to_cflags "-Wno-empty-body" end end - def caveats - <<-EOS.undent - Homebrew's Python framework - #{prefix}/Frameworks/Python.framework - - Python demo - #{HOMEBREW_PREFIX}/share/python/Extras - - Distribute and Pip have been installed. To update them - pip install --upgrade distribute - pip install --upgrade pip + def sitecustomize + <<-EOF.undent + # This file is created by Homebrew and is executed on each python startup. + # Don't print from here, or else python command line scripts may fail! + # + import os + import sys - To symlink "Idle" and the "Python Launcher" to ~/Applications - `brew linkapps` + if sys.version_info[0] != 2: + # This can only happen if the user has set the PYTHONPATH for 3.x and run Python 2.x or vice versa. + # Every Python looks at the PYTHONPATH variable and we can't fix it here in sitecustomize.py, + # because the PYTHONPATH is evaluated after the sitecustomize.py. Many modules (e.g. PyQt4) are + # built only for a specific version of Python and will fail with cryptic error messages. + # In the end this means: Don't set the PYTHONPATH permanently if you use different Python versions. + exit('Your PYTHONPATH points to a site-packages dir for Python 2.x but you are running Python ' + + str(sys.version_info[0]) + '.x!\\n PYTHONPATH is currently: "' + str(os.environ['PYTHONPATH']) + '"\\n' + + ' You should `unset PYTHONPATH` to fix this.') + else: + # Only do this for a brewed python: + opt_executable = '#{opt_bin}/python2.7' + if os.path.commonprefix([os.path.realpath(e) for e in [opt_executable, sys.executable]]).startswith('#{rack}'): + # Remove /System site-packages, and the Cellar site-packages + # which we moved to lib/pythonX.Y/site-packages. Further, remove + # HOMEBREW_PREFIX/lib/python because we later addsitedir(...). + sys.path = [ p for p in sys.path + if (not p.startswith('/System') and + not p.startswith('#{HOMEBREW_PREFIX}/lib/python') and + not (p.startswith('#{rack}') and p.endswith('site-packages'))) ] + + # LINKFORSHARED (and python-config --ldflags) return the + # full path to the lib (yes, "Python" is actually the lib, not a + # dir) so that third-party software does not need to add the + # -F/#{HOMEBREW_PREFIX}/Frameworks switch. + # Assume Framework style build (default since months in brew) + try: + from _sysconfigdata import build_time_vars + build_time_vars['LINKFORSHARED'] = '-u _PyMac_Error #{opt_prefix}/Frameworks/Python.framework/Versions/2.7/Python' + except: + pass # remember: don't print here. Better to fail silently. + + # Set the sys.executable to use the opt_prefix + sys.executable = opt_executable + + # Tell about homebrew's site-packages location. + # This is needed for Python to parse *.pth. + import site + site.addsitedir('#{site_packages}') + EOF + end - You can install Python packages with (the outdated easy_install or) - `pip install ` + def caveats; <<-EOS.undent + Setuptools and Pip have been installed. To update them + pip install --upgrade setuptools + pip install --upgrade pip - They will install into the site-package directory - #{site_packages} + You can install Python packages with + pip install - Executable python scripts will be put in: - #{scripts_folder} - so you may want to put "#{scripts_folder}" in your PATH, too. + They will install into the site-package directory + #{site_packages} - See: https://github.com/mxcl/homebrew/wiki/Homebrew-and-Python + See: https://github.com/Homebrew/homebrew/wiki/Homebrew-and-Python EOS end - def test + test do # Check if sqlite is ok, because we build with --enable-loadable-sqlite-extensions # and it can occur that building sqlite silently fails if OSX's sqlite is used. system "#{bin}/python", "-c", "import sqlite3" @@ -269,19 +351,51 @@ end __END__ diff --git a/setup.py b/setup.py -index 6b47451..b0400f8 100644 +index 716f08e..66114ef 100644 --- a/setup.py +++ b/setup.py -@@ -1702,9 +1702,9 @@ class PyBuildExt(build_ext): +@@ -1810,9 +1810,6 @@ 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 -+ # if (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): + if dir not in include_dirs: + include_dirs.append(dir) + +- # Check for various platform-specific directories +- if host_platform == 'sunos5': +- include_dirs.append('/usr/openwin/include') +- added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: +- # 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, +Status API Training Shop Blog About +© 2014 GitHub, Inc. Terms Privacy Security Contact +