traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This patch enables Cygwin Python to build _tkinter against Tcl/Tk 8.4. 

Note that this patch just reverts the lib_prefix (i.e., "cyg") portion
of my Tcl/Tk 8.3 patch. It seems that Cygwin Tcl/Tk is using a more
normal file naming convention again.
This commit is contained in:
Jason Tishler 2003-02-05 15:06:46 +00:00
parent 769e1ff4a1
commit cccac1a163
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup.py
View File

@ -915,22 +915,14 @@ class PyBuildExt(build_ext):
self.detect_tkinter_darwin(inc_dirs, lib_dirs): self.detect_tkinter_darwin(inc_dirs, lib_dirs):
return 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 # Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without # The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin. # dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None tcllib = tklib = tcl_includes = tk_includes = None
for version in ['8.4', '84', '8.3', '83', '8.2', for version in ['8.4', '84', '8.3', '83', '8.2',
'82', '8.1', '81', '8.0', '80']: '82', '8.1', '81', '8.0', '80']:
tklib = self.compiler.find_library_file(lib_dirs, tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
lib_prefix + 'tk' + version) tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
tcllib = self.compiler.find_library_file(lib_dirs,
lib_prefix + 'tcl' + version)
if tklib and tcllib: if tklib and tcllib:
# Exit the loop when we've found the Tcl/Tk libraries # Exit the loop when we've found the Tcl/Tk libraries
break break
@ -988,8 +980,8 @@ class PyBuildExt(build_ext):
libs.append('BLT') libs.append('BLT')
# Add the Tcl/Tk libraries # Add the Tcl/Tk libraries
libs.append(lib_prefix + 'tk'+ version) libs.append('tk'+ version)
libs.append(lib_prefix + 'tcl'+ version) libs.append('tcl'+ version)
if platform in ['aix3', 'aix4']: if platform in ['aix3', 'aix4']:
libs.append('ld') libs.append('ld')