646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
--- origsrc/setup.py 2008-02-04 17:41:02.000000000 -0600
|
|
+++ src/setup.py 2008-07-02 02:11:28.671875000 -0500
|
|
@@ -1277,12 +1279,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'):
|
|
@@ -1300,9 +1296,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,
|