diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch new file mode 100644 index 0000000000..d74e4b1776 --- /dev/null +++ b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | # We need to supply STAGING_INCDIR here, otherwise the Tk headers | ||
4 | # will not be found. | ||
5 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> | ||
6 | |||
7 | Index: Python-2.6.1/setup.py | ||
8 | =================================================================== | ||
9 | --- Python-2.6.1.orig/setup.py | ||
10 | +++ Python-2.6.1/setup.py | ||
11 | @@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext): | ||
12 | dotversion = dotversion[:-1] + '.' + dotversion[-1] | ||
13 | tcl_include_sub = [] | ||
14 | tk_include_sub = [] | ||
15 | - for dir in inc_dirs: | ||
16 | + for dir in [os.getenv("STAGING_INCDIR")]: | ||
17 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] | ||
18 | tk_include_sub += [dir + os.sep + "tk" + dotversion] | ||
19 | tk_include_sub += tcl_include_sub | ||
20 | @@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext): | ||
21 | if dir not in include_dirs: | ||
22 | include_dirs.append(dir) | ||
23 | |||
24 | - # Check for various platform-specific directories | ||
25 | - if platform == 'sunos5': | ||
26 | - include_dirs.append('/usr/openwin/include') | ||
27 | - added_lib_dirs.append('/usr/openwin/lib') | ||
28 | - elif os.path.exists('/usr/X11R6/include'): | ||
29 | - include_dirs.append('/usr/X11R6/include') | ||
30 | - added_lib_dirs.append('/usr/X11R6/lib64') | ||
31 | - added_lib_dirs.append('/usr/X11R6/lib') | ||
32 | - elif os.path.exists('/usr/X11R5/include'): | ||
33 | - include_dirs.append('/usr/X11R5/include') | ||
34 | - added_lib_dirs.append('/usr/X11R5/lib') | ||
35 | - else: | ||
36 | - # Assume default location for X11 | ||
37 | - include_dirs.append('/usr/X11/include') | ||
38 | - added_lib_dirs.append('/usr/X11/lib') | ||
39 | - | ||
40 | # If Cygwin, then verify that X is installed before proceeding | ||
41 | if platform == 'cygwin': | ||
42 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||