Patch #660485: Cygwin _tkinter Tcl/Tk 8.3 patch
The attached patch enables Cygwin Python to
build cleanly against the latest Cygwin Tcl/Tk
which is based on Tcl/Tk 8.3. It also prevents
building against the real X headers, if installed.
diff --git a/setup.py b/setup.py
index cad529b..85fbf41 100644
--- a/setup.py
+++ b/setup.py
@@ -887,6 +887,12 @@
self.detect_tkinter_darwin(inc_dirs, lib_dirs):
return
+ # Set platform specific library prefix, if any
+ if platform == 'cygwin':
+ lib_prefix = 'cyg'
+ else:
+ lib_prefix = ''
+
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
@@ -894,9 +900,9 @@
for version in ['8.4', '84', '8.3', '83', '8.2',
'82', '8.1', '81', '8.0', '80']:
tklib = self.compiler.find_library_file(lib_dirs,
- 'tk' + version )
+ lib_prefix + 'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs,
- 'tcl' + version )
+ lib_prefix + 'tcl' + version)
if tklib and tcllib:
# Exit the loop when we've found the Tcl/Tk libraries
break
@@ -927,6 +933,11 @@
if platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
+ elif platform == 'cygwin':
+ # Verify that the pseudo-X headers are installed before proceeding
+ x11_inc = find_file('X11/Xlib.h', [], inc_dirs)
+ if x11_inc is None:
+ return
elif os.path.exists('/usr/X11R6/include'):
include_dirs.append('/usr/X11R6/include')
added_lib_dirs.append('/usr/X11R6/lib')
@@ -938,13 +949,6 @@
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':
- x11_inc = find_file('X11/Xlib.h', [], inc_dirs)
- if x11_inc is None:
- # X header files missing, so give up
- return
-
# Check for BLT extension
if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
'BLT8.0'):
@@ -956,8 +960,8 @@
libs.append('BLT')
# Add the Tcl/Tk libraries
- libs.append('tk'+version)
- libs.append('tcl'+version)
+ libs.append(lib_prefix + 'tk'+ version)
+ libs.append(lib_prefix + 'tcl'+ version)
if platform in ['aix3', 'aix4']:
libs.append('ld')