diff options
| author | John Lee <john_lee@openmoko.org> | 2008-02-29 10:18:28 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2008-02-29 10:18:28 +0000 |
| commit | 022ac4bfbd6d85f4accbd23f18138a10b2e9f0de (patch) | |
| tree | 1a6d1e12611c2b3a341f3293af95c8575edc3c4e /packages/python/python-2.5.2/fix-tkinter-detection.patch | |
| parent | fe6f8c336429aa31e9b3a74ecd9f1e8a320a8a07 (diff) | |
| parent | 1e4b78b265763e2b2d0d430f62b86aab5826a48e (diff) | |
merge of 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
and 'e1563879f370dd02713e036ee932bb571cce4bc4'
Diffstat (limited to 'packages/python/python-2.5.2/fix-tkinter-detection.patch')
| -rw-r--r-- | packages/python/python-2.5.2/fix-tkinter-detection.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/packages/python/python-2.5.2/fix-tkinter-detection.patch b/packages/python/python-2.5.2/fix-tkinter-detection.patch new file mode 100644 index 0000000000..93bd343381 --- /dev/null +++ b/packages/python/python-2.5.2/fix-tkinter-detection.patch @@ -0,0 +1,41 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: Python-2.5.1/setup.py +=================================================================== +--- Python-2.5.1.orig/setup.py ++++ Python-2.5.1/setup.py +@@ -1227,7 +1227,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 +@@ -1246,22 +1246,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) |