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 | 46 |
1 files changed, 0 insertions, 46 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 deleted file mode 100644 index 650ceb5951..0000000000 --- a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
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 | |||
6 | Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille.de> | ||
7 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
8 | |||
9 | Rebased for python-2.7.9 | ||
10 | |||
11 | diff --git a/setup.py b/setup.py | ||
12 | index 8fe1fb8..67eda74 100644 | ||
13 | --- a/setup.py | ||
14 | +++ b/setup.py | ||
15 | @@ -1892,7 +1892,7 @@ class PyBuildExt(build_ext): | ||
16 | dotversion = dotversion[:-1] + '.' + dotversion[-1] | ||
17 | tcl_include_sub = [] | ||
18 | tk_include_sub = [] | ||
19 | - for dir in inc_dirs: | ||
20 | + for dir in [os.getenv("STAGING_INCDIR")]: | ||
21 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] | ||
22 | tk_include_sub += [dir + os.sep + "tk" + dotversion] | ||
23 | tk_include_sub += tcl_include_sub | ||
24 | @@ -1911,22 +1911,6 @@ class PyBuildExt(build_ext): | ||
25 | if dir not in include_dirs: | ||
26 | include_dirs.append(dir) | ||
27 | |||
28 | - # Check for various platform-specific directories | ||
29 | - if host_platform == 'sunos5': | ||
30 | - include_dirs.append('/usr/openwin/include') | ||
31 | - added_lib_dirs.append('/usr/openwin/lib') | ||
32 | - elif os.path.exists('/usr/X11R6/include'): | ||
33 | - include_dirs.append('/usr/X11R6/include') | ||
34 | - added_lib_dirs.append('/usr/X11R6/lib64') | ||
35 | - added_lib_dirs.append('/usr/X11R6/lib') | ||
36 | - elif os.path.exists('/usr/X11R5/include'): | ||
37 | - include_dirs.append('/usr/X11R5/include') | ||
38 | - added_lib_dirs.append('/usr/X11R5/lib') | ||
39 | - else: | ||
40 | - # Assume default location for X11 | ||
41 | - include_dirs.append('/usr/X11/include') | ||
42 | - added_lib_dirs.append('/usr/X11/lib') | ||
43 | - | ||
44 | # If Cygwin, then verify that X is installed before proceeding | ||
45 | if host_platform == 'cygwin': | ||
46 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) | ||