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