MSYS2-packages/python2/0020-tkinter-x11.patch
2014-06-04 11:03:57 +04:00

29 lines
1.1 KiB
Diff

diff -Naur a/setup.py b/setup.py
--- a/setup.py 2014-05-31 22:58:40.000000000 +0400
+++ b/setup.py 2014-06-04 10:16:36.428200000 +0400
@@ -1927,12 +1927,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 host_platform == 'cygwin':
- x11_inc = find_file('X11/Xlib.h', [], include_dirs)
- if x11_inc is None:
- return
-
# Check for BLT extension
if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
'BLT8.0'):
@@ -1950,9 +1944,8 @@
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')
+ # Finally, link with the X11 libraries
+ libs.append('X11')
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
define_macros=[('WITH_APPINIT', 1)] + defs,