Revert "Update python to 2.7.10"
This seems to cause issue 517460.
This reverts commit 820463a78e4483c6d5b59e7aecaafdbfcdabd0f8.
Change-Id: Iddb94db380ffe0992c894044b374993908539e35
Reviewed-on: https://chromium-review.googlesource.com/291187
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Commit-Queue: Cheng-Yi Chiang <cychiang@chromium.org>
Trybot-Ready: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Cheng-Yi Chiang <cychiang@chromium.org>
diff --git a/dev-lang/python/files/python-2.7.3-cross-h2py.patch b/dev-lang/python/files/python-2.7.3-cross-h2py.patch
new file mode 100644
index 0000000..8801fa8
--- /dev/null
+++ b/dev-lang/python/files/python-2.7.3-cross-h2py.patch
@@ -0,0 +1,36 @@
+use the host python when running the h2py code, and have that search sysroot
+
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -431,10 +431,10 @@
+ $(srcdir)/Lib/$(PLATDIR):
+ mkdir $(srcdir)/Lib/$(PLATDIR)
+ cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
+- export PATH; PATH="`pwd`:$$PATH"; \
++ export INCLUDE="$(SYSROOT)$(INCLUDEDIR)"; \
+ export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
+ export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
+- export EXE; EXE="$(BUILDEXE)"; \
++ export HOSTPYTHON="`realpath $(HOSTPYTHON)`"; \
+ cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
+
+ python-config: $(srcdir)/Misc/python-config.in
+--- a/Tools/scripts/h2py.py
++++ b/Tools/scripts/h2py.py
+@@ -60,6 +60,7 @@ except KeyError:
+ searchdirs=['/usr/include']
+
+ def main():
++ sysroot = os.getenv('SYSROOT', '')
+ global filedict
+ opts, args = getopt.getopt(sys.argv[1:], 'i:')
+ for o, a in opts:
+@@ -72,7 +73,7 @@ def main():
+ sys.stdout.write('# Generated by h2py from stdin\n')
+ process(sys.stdin, sys.stdout)
+ else:
+- fp = open(filename, 'r')
++ fp = open(sysroot + filename, 'r')
+ outfile = os.path.basename(filename)
+ i = outfile.rfind('.')
+ if i > 0: outfile = outfile[:i]