diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-03 12:30:36 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-03 12:30:36 +0000 |
| commit | 4601ad28765bf7ef207974f9ad7fc209d3745088 (patch) | |
| tree | 7606ec3468f5377ea19776cf43227427582ce410 /packages/python/python-2.4.4/fix-tkinter-detection.patch | |
| parent | d9a54a4705d13b90f074817368059cb8b0f20f20 (diff) | |
| parent | ef937c49f30fa5b7c6656c7f9814cb1fb161e070 (diff) | |
merge of '2f655855e9cd21f0db11577a04d65162273a4b1c'
and '7754c88af17176a35aedbbe47eeab2d9d5d7774b'
Diffstat (limited to 'packages/python/python-2.4.4/fix-tkinter-detection.patch')
| -rw-r--r-- | packages/python/python-2.4.4/fix-tkinter-detection.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/python/python-2.4.4/fix-tkinter-detection.patch b/packages/python/python-2.4.4/fix-tkinter-detection.patch new file mode 100644 index 0000000000..602aa8e021 --- /dev/null +++ b/packages/python/python-2.4.4/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) |