diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-07-06 05:07:49 -0700 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-08 22:05:20 -0700 |
| commit | e18aba581c7f3f8518b8a9a850b6fe1eabc285ff (patch) | |
| tree | 364264738a43168c79ba49402b0a7535e0a24ad8 /meta/packages/python/python-2.6.2/03-fix-tkinter-detection.patch | |
| parent | 936a73eae5fd5732c9dc5ae2a47d6196f7f69c0a (diff) | |
| download | openembedded-core-e18aba581c7f3f8518b8a9a850b6fe1eabc285ff.tar.gz openembedded-core-e18aba581c7f3f8518b8a9a850b6fe1eabc285ff.tar.bz2 openembedded-core-e18aba581c7f3f8518b8a9a850b6fe1eabc285ff.zip | |
python: upgrade from 2.6.2 to 2.6.5
python-native: upgrade from 2.6.1 to 2.6.5
Also removed these older version files:
python_2.5.2
python-native_2.5.1
Rebased the patches to the newer code.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@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, 0 insertions, 40 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 deleted file mode 100644 index a1a385a07c..0000000000 --- a/meta/packages/python/python-2.6.2/03-fix-tkinter-detection.patch +++ /dev/null @@ -1,40 +0,0 @@ -# We need to supply STAGING_INCDIR here, otherwise the Tk headers -# will not be found. -# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> - -Index: Python-2.6.1/setup.py -=================================================================== ---- Python-2.6.1.orig/setup.py -+++ Python-2.6.1/setup.py -@@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext): - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext): - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) |