diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-15 13:55:06 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-11-15 13:55:06 +0000 |
commit | 3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc (patch) | |
tree | d6731c1df8707972687bac18db0336599cfffe66 /meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch | |
parent | eaafa55d861b0a31e62895845730e778a0253ec9 (diff) | |
download | openembedded-core-3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc.tar.gz openembedded-core-3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc.tar.bz2 openembedded-core-3cfbc3b20b524748ec7253d6dfdc0c5eb17836cc.zip |
python: update to 2.5.1 from OE (without tcl/tk deps)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3176 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch')
-rw-r--r-- | meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch b/meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch deleted file mode 100644 index 602aa8e021..0000000000 --- a/meta-extras/packages/python/python-2.4.4/fix-tkinter-detection.patch +++ /dev/null @@ -1,39 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- Python-2.4.1/setup.py~fix-tkinter-detection -+++ Python-2.4.1/setup.py -@@ -999,7 +999,7 @@ - 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 -@@ -1018,22 +1018,6 @@ - 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) |