#
# 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)
cgit/openembedded-core.git/'>summary</a><a href='/cgit/openembedded-core.git/refs/?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1'>refs</a><a class='active' href='/cgit/openembedded-core.git/log/scripts/cp-noerror?showmsg=1'>log</a><a href='/cgit/openembedded-core.git/tree/scripts/cp-noerror?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1'>tree</a><a href='/cgit/openembedded-core.git/commit/scripts/cp-noerror?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1'>commit</a><a href='/cgit/openembedded-core.git/diff/scripts/cp-noerror?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit/openembedded-core.git/log/scripts/cp-noerror'>
<input type='hidden' name='id' value='0c243a550f5a0e539823fe168bcc7b2bbb9f19e1'/><input type='hidden' name='showmsg' value='1'/><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/openembedded-core.git/log/?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1&amp;showmsg=1'>root</a>/<a href='/cgit/openembedded-core.git/log/scripts?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1&amp;showmsg=1'>scripts</a>/<a href='/cgit/openembedded-core.git/log/scripts/cp-noerror?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1&amp;showmsg=1'>cp-noerror</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/openembedded-core.git/log/scripts/cp-noerror?id=0c243a550f5a0e539823fe168bcc7b2bbb9f19e1'>Collapse</a>)</th><th class='left'>Author</th><th class='left'>Files</th></tr>
<tr class='logheader'><td><span title='2012-10-18 12:03:28 +0100'>2012-10-18</span></td><td class='logsubject'><a href='/cgit/openembedded-core.git/commit/scripts/cp-noerror?id=8c5544c2311b080bb212efb7f6b804db63e125f5'>scripts/cp-noerror: Try and use hardlinks if possible</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr class='nohover-highlight'><td/><td colspan='4' class='logmsg'>
Since we generally have lots of copies of the directories created using this tool, use
hardlinks where possible. This should save a little disk space and improve performance
slightly.

(From OE-Core rev: bfa11c028c2da093f7b4e6b7b1d611da90ae052f)

Signed-off-by: Richard Purdie &lt;richard.purdie@linuxfoundation.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2012-10-18 12:03:27 +0100'>2012-10-18</span></td><td class='logsubject'><a href='/cgit/openembedded-core.git/commit/scripts/cp-noerror?id=08542718504d2b53d140a9e6be73c84cc0e047e0'>scripts/cp-noerror: Copy the code from shutils.copytree, update not to error ↵</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr class='nohover-highlight'><td/><td colspan='4' class='logmsg'>
if the mkdir fails

Signed-off-by: Richard Purdie &lt;richard.purdie@linuxfoundation.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2012-05-30 11:20:52 +0100'>2012-05-30</span></td><td class='logsubject'><a href='/cgit/openembedded-core.git/commit/scripts/cp-noerror?id=0f81fbc0df73675aeb79c724858799a3b6a02f85'>scripts/cp-noerror: Add a special copy function to fix autotools issues</a></td><td>Richard Purdie</td><td>1</td></tr>
<tr class='nohover-highlight'><td/><td colspan='4' class='logmsg'>
Currently we copy the aclocal directory to the build so that autotools
doesn't see .m4 files disappear when its processing them. This can happen
if for example, package X is being rebuilt at the same time as Y and it
gets uninstalled from sstate (assuming there are no dependencies between
X and Y). This code making the copy was added to avoid races but introduces
a race of its own, namely that the files can disappear during the copy.

This patch adds a cp-noerror script which silently ignores such errors
and gives the behaviour we need in this case. It hence fixes issues which
crop up for users and the autobuilder occasionally.

[YOCTO #2485]

Signed-off-by: Richard Purdie &lt;richard.purdie@linuxfoundation.org&gt;


</td></tr>