summaryrefslogtreecommitdiffstats
path: root/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch')
-rw-r--r--meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch
deleted file mode 100644
index 93bd343381..0000000000
--- a/meta-extras/packages/python/python-2.5.2/fix-tkinter-detection.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6Index: Python-2.5.1/setup.py
7===================================================================
8--- Python-2.5.1.orig/setup.py
9+++ Python-2.5.1/setup.py
10@@ -1227,7 +1227,7 @@ class PyBuildExt(build_ext):
11 dotversion = dotversion[:-1] + '.' + dotversion[-1]
12 tcl_include_sub = []
13 tk_include_sub = []
14- for dir in inc_dirs:
15+ for dir in [os.getenv("STAGING_INCDIR")]:
16 tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
17 tk_include_sub += [dir + os.sep + "tk" + dotversion]
18 tk_include_sub += tcl_include_sub
19@@ -1246,22 +1246,6 @@ class PyBuildExt(build_ext):
20 if dir not in include_dirs:
21 include_dirs.append(dir)
22
23- # Check for various platform-specific directories
24- if platform == 'sunos5':
25- include_dirs.append('/usr/openwin/include')
26- added_lib_dirs.append('/usr/openwin/lib')
27- elif os.path.exists('/usr/X11R6/include'):
28- include_dirs.append('/usr/X11R6/include')
29- added_lib_dirs.append('/usr/X11R6/lib64')
30- added_lib_dirs.append('/usr/X11R6/lib')
31- elif os.path.exists('/usr/X11R5/include'):
32- include_dirs.append('/usr/X11R5/include')
33- added_lib_dirs.append('/usr/X11R5/lib')
34- else:
35- # Assume default location for X11
36- include_dirs.append('/usr/X11/include')
37- added_lib_dirs.append('/usr/X11/lib')
38-
39 # If Cygwin, then verify that X is installed before proceeding
40 if platform == 'cygwin':
41 x11_inc = find_file('X11/Xlib.h', [], include_dirs)