# We need to supply STAGING_INCDIR here, otherwise the Tk headers
# will not be found.
# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de>

Index: Python-2.6.1/setup.py
===================================================================
--- Python-2.6.1.orig/setup.py
+++ Python-2.6.1/setup.py
@@ -1543,7 +1543,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
@@ -1562,22 +1562,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)
a></td><td class='form'><form class='right' method='get' action='/cgit/multitech-oe.git/log/packages/file'>
<input type='hidden' name='id' value='a44dc693a84b10ccc1abb2d2ba816b6c5584b8e7'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/multitech-oe.git/log/?id=a44dc693a84b10ccc1abb2d2ba816b6c5584b8e7'>root</a>/<a href='/cgit/multitech-oe.git/log/packages?id=a44dc693a84b10ccc1abb2d2ba816b6c5584b8e7'>packages</a>/<a href='/cgit/multitech-oe.git/log/packages/file?id=a44dc693a84b10ccc1abb2d2ba816b6c5584b8e7'>file</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/cgit/multitech-oe.git/log/packages/file?id=a44dc693a84b10ccc1abb2d2ba816b6c5584b8e7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr><td><span title='2007-07-31 14:14:52 +0000'>2007-07-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=0b26f096fa49da14e38beec8df358f901e541536'>file-native/compress.c needs zlib.h so it must depend on zlib-native</a></td><td>Henning Heinold</td><td>1</td></tr>
<tr><td><span title='2007-07-11 11:12:11 +0000'>2007-07-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=f93a8fefcc42bbb871d1b26e9a814c08954c42c7'>file: update 4.20 to 4.21, 4.21 contains security and build fixes for some archs</a></td><td>Michael Lauer</td><td>2</td></tr>
<tr><td><span title='2007-03-02 15:12:23 +0000'>2007-03-02</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=3df911cf4b9fa4d871ef96e7d9f61a50c6890fbe'>file-native_4.20.bb,file_4.20.bb : new version of everyones favourite util.</a></td><td>Graeme Gregory</td><td>2</td></tr>
<tr><td><span title='2007-01-07 00:13:48 +0000'>2007-01-07</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=6ec38ff016f22f80a2d8ea8b70aa97d5900b9e76'>file: drop 4.16</a></td><td>Marcin Juszkiewicz</td><td>2</td></tr>
<tr><td><span title='2006-12-31 13:13:53 +0000'>2006-12-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=f907777709b20d8d73e3587026296a6616262229'>remove extra whitespace at end-of-line in about 900 bb files.</a></td><td>Rolf Leggewie</td><td>2</td></tr>
<tr><td><span title='2006-11-09 10:37:33 +0000'>2006-11-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=13b1746414d7674c0dfc3e53c4a9c92d8c6c8288'>file, file-native 4.18 : replaced the magic files for filesystems and dump</a></td><td>Graeme Gregory</td><td>4</td></tr>
<tr><td><span title='2006-11-09 08:59:49 +0000'>2006-11-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=a0d6dc8f1bd911e1d0f136ca129727cdce422004'>disapproval of revision '00fbddaa13e002e339a062c328b76d88c57a345e'</a></td><td>Koen Kooi</td><td>2</td></tr>
<tr><td><span title='2006-11-09 08:53:08 +0000'>2006-11-09</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=1a68d0f3baf3810373426db69655db049172176d'>file: add 4.18 version</a></td><td>Dirk Opfer</td><td>2</td></tr>
<tr><td><span title='2006-08-05 14:01:52 +0000'>2006-08-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=803427eedbf62d58bd250d577f2c0afb5b68383d'>packages: sed -i s/^"include "/"require "/ */*.bb GNU sed rocks!</a></td><td>Holger Freyther</td><td>1</td></tr>
<tr><td><span title='2006-03-08 16:15:15 +0000'>2006-03-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=4ca2438a9db94dc1ef5376087974a5f08e834927'>file-native 4.16: use just built 'file' to generate magic files - now it shou...</a></td><td>Marcin Juszkiewicz</td><td>3</td></tr>
<tr><td><span title='2006-03-08 13:44:29 +0000'>2006-03-08</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=2f81f768373c2ffd26c88ea0f77b5582de975572'>file: upgraded to 4.16 (4.13 is not fetchable)</a></td><td>Marcin Juszkiewicz</td><td>2</td></tr>
<tr><td><span title='2006-01-31 17:13:37 +0000'>2006-01-31</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=0181fca36610a03b991be5985aa53f794e9ce323'>file-native: fix do_stage in 4.13</a></td><td>John Bowler</td><td>2</td></tr>
<tr><td><span title='2006-01-04 10:36:03 +0000'>2006-01-04</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=bcf39886ed42157c9b5ed692c36014f4fe74168c'>Revert the changes from revisions 65af73a95a851d2e8c3cf2f523f1acc488be0208, 2...</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr><td><span title='2006-01-02 13:16:14 +0000'>2006-01-02</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=ed5dc96cce94e07c31c681ae470b73fd6fb51b2b'>autotooled packages: remove custom do_stage</a></td><td>Philipp Zabel</td><td>1</td></tr>
<tr><td><span title='2005-10-11 22:20:01 +0000'>2005-10-11</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=65af6f4a9ec560b118fad10eb4564a2dff0d6f47'>file: autotools_stage_all in 4.13</a></td><td>Koen Kooi</td><td>1</td></tr>
<tr><td><span title='2005-06-30 08:19:37 +0000'>2005-06-30</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=c8e5702127e507e82e6f68a4b8c546803accea9d'>import clean BK tree at cset 1.3670</a></td><td>Koen Kooi</td><td>2</td></tr>
<tr><td><span title='2005-04-12 11:52:46 +0000'>2005-04-12</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=b217b6746d7d9f61aea647c586fb77081762f07d'>Merge bk://oe-devel@oe-devel.bkbits.net/openembedded</a></td><td>Michael Lauer</td><td>1</td></tr>
<tr><td><span title='2005-04-05 14:21:39 +0000'>2005-04-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=50c263eb558e1ea59fed2b813ee011fd9cfb95f5'>Merge bk://oe-devel@oe-devel.bkbits.net/openembedded</a></td><td>Michael Lauer</td><td>2</td></tr>
<tr><td><span title='2005-04-05 13:38:54 +0000'>2005-04-05</span></td><td><a href='/cgit/multitech-oe.git/commit/packages/file?id=7d40090e8f4703760e346c22bc97cf56d571df95'>Merge bk://oe-devel@oe-devel.bkbits.net/openembedded</a></td><td>Michael Lauer</td><td>1</td></tr>