| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [embedded specific] |
| 2 | |
| 3 | # We need to supply STAGING_INCDIR here, otherwise the Tk headers |
| 4 | # will not be found. |
| 5 | # Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de> |
| 6 | |
| 7 | Index: Python-3.3.0rc2/setup.py |
| 8 | =================================================================== |
| 9 | --- Python-3.3.0rc2.orig/setup.py 2012-09-20 15:24:14.009124003 -0700 |
| 10 | +++ Python-3.3.0rc2/setup.py 2012-09-20 15:25:08.449124963 -0700 |
| 11 | @@ -1620,7 +1620,7 @@ |
| 12 | dotversion = dotversion[:-1] + '.' + dotversion[-1] |
| 13 | tcl_include_sub = [] |
| 14 | tk_include_sub = [] |
| 15 | - for dir in inc_dirs: |
| 16 | + for dir in [os.getenv("STAGING_INCDIR")]: |
| 17 | tcl_include_sub += [dir + os.sep + "tcl" + dotversion] |
| 18 | tk_include_sub += [dir + os.sep + "tk" + dotversion] |
| 19 | tk_include_sub += tcl_include_sub |
| 20 | @@ -1639,22 +1639,6 @@ |
| 21 | if dir not in include_dirs: |
| 22 | include_dirs.append(dir) |
| 23 | |
| 24 | - # Check for various platform-specific directories |
| 25 | - if host_platform == 'sunos5': |
| 26 | - include_dirs.append('/usr/openwin/include') |
| 27 | - added_lib_dirs.append('/usr/openwin/lib') |
| 28 | - elif os.path.exists('/usr/X11R6/include'): |
| 29 | - include_dirs.append('/usr/X11R6/include') |
| 30 | - added_lib_dirs.append('/usr/X11R6/lib64') |
| 31 | - added_lib_dirs.append('/usr/X11R6/lib') |
| 32 | - elif os.path.exists('/usr/X11R5/include'): |
| 33 | - include_dirs.append('/usr/X11R5/include') |
| 34 | - added_lib_dirs.append('/usr/X11R5/lib') |
| 35 | - else: |
| 36 | - # Assume default location for X11 |
| 37 | - include_dirs.append('/usr/X11/include') |
| 38 | - added_lib_dirs.append('/usr/X11/lib') |
| 39 | - |
| 40 | # If Cygwin, then verify that X is installed before proceeding |
| 41 | if host_platform == 'cygwin': |
| 42 | x11_inc = find_file('X11/Xlib.h', [], include_dirs) |