diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-09-28 14:08:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-28 14:08:04 +0000 |
| commit | b3796280545127a63960c9638168f6e1c9a76c26 (patch) | |
| tree | ee88c1731c743172415518defa472c52ec2c95cc /packages/python/python-2.4.2/fix-tkinter-detection.patch | |
| parent | d7f9614d9602eeefab3bba015184ec0f7572ba03 (diff) | |
| parent | 3ce6158c5a4e3c1c9b6ab90430b4ddc185e981f8 (diff) | |
merge of 2ee92374446758a6e4eb30e6b81483816ae44575
and ac0f7cef89d03ac964eee9b5bee66880b7943389
Diffstat (limited to 'packages/python/python-2.4.2/fix-tkinter-detection.patch')
| -rw-r--r-- | packages/python/python-2.4.2/fix-tkinter-detection.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/python/python-2.4.2/fix-tkinter-detection.patch b/packages/python/python-2.4.2/fix-tkinter-detection.patch new file mode 100644 index 0000000000..602aa8e021 --- /dev/null +++ b/packages/python/python-2.4.2/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) |