diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-04-04 09:27:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-04 09:27:59 +0000 |
| commit | 414a70ace8cf06857958fad7f87cfcb63b350072 (patch) | |
| tree | 71a0005a35f07b5273ebfe337783e692c3262c0a /packages/python/python-2.4.3/fix-tkinter-detection.patch | |
| parent | 2444331e2870baa9e5bf3978571cc7fc06cd13c7 (diff) | |
| parent | 6ce3ce8860572954d283d4ec66364875d66a6d9c (diff) | |
merge of 85a1c1efe7466253130cd2e2a63079154ba54454
and c67d38b84a548cc9efa81f9371658f5c59e87e43
Diffstat (limited to 'packages/python/python-2.4.3/fix-tkinter-detection.patch')
| -rw-r--r-- | packages/python/python-2.4.3/fix-tkinter-detection.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/python/python-2.4.3/fix-tkinter-detection.patch b/packages/python/python-2.4.3/fix-tkinter-detection.patch new file mode 100644 index 0000000000..602aa8e021 --- /dev/null +++ b/packages/python/python-2.4.3/fix-tkinter-detection.patch @@ -0,0 +1,39 @@ + +# +# 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) |