Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when
looking for headers and libraries.

--- Python-2.7.10/setup.py	2015-10-07 18:33:18.125153186 +0200
+++ Python-2.7.10/setup.py	2015-10-07 18:33:47.497347552 +0200
@@ -526,6 +526,14 @@ class PyBuildExt(build_ext):
             inc_dirs += ['/system/include', '/atheos/autolnk/include']
             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
 
+        # Always honor these variables.
+        if not cross_compiling:
+            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+        else:
+            lib_dirs = os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep)
+            inc_dirs = os.getenv('CROSS_CPATH', '').split(os.pathsep)
+
         # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
         if host_platform in ['osf1', 'unixware7', 'openunix8']:
             lib_dirs += ['/usr/ccs/lib']
'tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>refs</a><a class='active' href='/guix/log/tests/guix-graph.sh'>log</a><a href='/guix/tree/tests/guix-graph.sh?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>tree</a><a href='/guix/commit/tests/guix-graph.sh?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>commit</a><a href='/guix/diff/tests/guix-graph.sh?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-graph.sh'>
<input type='hidden' name='id' value='dd25c46887d1f0279f00232ef4d1bbda404563a6'/><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='/guix/log/?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>root</a>/<a href='/guix/log/tests?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>tests</a>/<a href='/guix/log/tests/guix-graph.sh?id=dd25c46887d1f0279f00232ef4d1bbda404563a6'>guix-graph.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-graph.sh?id=dd25c46887d1f0279f00232ef4d1bbda404563a6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-16 23:56:56 +0100'>2022-01-16</span></td><td><a href='/guix/commit/tests/guix-graph.sh?id=a1037aa87b39d4c774fe398fc97a58bafeb063d1'>tests: Clean up after 'tests/guix-graph.sh'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes a regression introduced in
a773c3142dd168e1c4480614d3f5fd9d003954cd, which would lead the first
'trap' to be ignored, thereby leaving 't-guix-graph-*' directories
behind it.

* tests/guix-graph.sh: Remove first 'trap' line that had no effect;
replace second 'trap' line.
</span></span></td><td>Ludovic Courtès</td></tr>