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 | 26 |
1 files changed, 15 insertions, 11 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 index d74e4b1776..650ceb5951 100644 --- a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch +++ b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch | |||
@@ -1,14 +1,18 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 1 | Upstream-Status: Inappropriate [embedded specific] |
2 | 2 | ||
3 | # We need to supply STAGING_INCDIR here, otherwise the Tk headers | 3 | We need to supply STAGING_INCDIR here, otherwise the Tk headers |
4 | # will not be found. | 4 | will not be found. |
5 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> | ||
6 | 5 | ||
7 | Index: Python-2.6.1/setup.py | 6 | Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille.de> |
8 | =================================================================== | 7 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
9 | --- Python-2.6.1.orig/setup.py | 8 | |
10 | +++ Python-2.6.1/setup.py | 9 | Rebased for python-2.7.9 |
11 | @@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext): | 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): | ||
12 | dotversion = dotversion[:-1] + '.' + dotversion[-1] | 16 | dotversion = dotversion[:-1] + '.' + dotversion[-1] |
13 | tcl_include_sub = [] | 17 | tcl_include_sub = [] |
14 | tk_include_sub = [] | 18 | tk_include_sub = [] |
@@ -17,12 +21,12 @@ Index: Python-2.6.1/setup.py | |||
17 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] | 21 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] |
18 | tk_include_sub += [dir + os.sep + "tk" + dotversion] | 22 | tk_include_sub += [dir + os.sep + "tk" + dotversion] |
19 | tk_include_sub += tcl_include_sub | 23 | tk_include_sub += tcl_include_sub |
20 | @@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext): | 24 | @@ -1911,22 +1911,6 @@ class PyBuildExt(build_ext): |
21 | if dir not in include_dirs: | 25 | if dir not in include_dirs: |
22 | include_dirs.append(dir) | 26 | include_dirs.append(dir) |
23 | 27 | ||
24 | - # Check for various platform-specific directories | 28 | - # Check for various platform-specific directories |
25 | - if platform == 'sunos5': | 29 | - if host_platform == 'sunos5': |
26 | - include_dirs.append('/usr/openwin/include') | 30 | - include_dirs.append('/usr/openwin/include') |
27 | - added_lib_dirs.append('/usr/openwin/lib') | 31 | - added_lib_dirs.append('/usr/openwin/lib') |
28 | - elif os.path.exists('/usr/X11R6/include'): | 32 | - elif os.path.exists('/usr/X11R6/include'): |
@@ -38,5 +42,5 @@ Index: Python-2.6.1/setup.py | |||
38 | - added_lib_dirs.append('/usr/X11/lib') | 42 | - added_lib_dirs.append('/usr/X11/lib') |
39 | - | 43 | - |
40 | # If Cygwin, then verify that X is installed before proceeding | 44 | # If Cygwin, then verify that X is installed before proceeding |
41 | if platform == 'cygwin': | 45 | if host_platform == 'cygwin': |
42 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) | 46 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) |