From 31e38931c25a153ca1c015ed89b5386f942ef6c6 Mon Sep 17 00:00:00 2001
From: "Michael.X" <xxnet.dev@gmail.com>
Date: Tue, 29 Mar 2016 21:31:18 +0800
Subject: [PATCH] fix platform fail on p4a

---
 pythonforandroid/recipes/python2/__init__.py  |  1 +
 .../python2/patches/fix-platform.patch        | 71 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 pythonforandroid/recipes/python2/patches/fix-platform.patch

diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
index 10eeda2519..8b0e3d4f6d 100644
--- a/pythonforandroid/recipes/python2/__init__.py
+++ b/pythonforandroid/recipes/python2/__init__.py
@@ -23,6 +23,7 @@ class Python2Recipe(TargetPythonRecipe):
                'patches/fix-gethostbyaddr.patch',
                'patches/fix-setup-flags.patch',
                'patches/fix-filesystemdefaultencoding.patch',
+               'patches/fix-platform.patch',
                'patches/fix-termios.patch',
                'patches/custom-loader.patch',
                'patches/verbose-compilation.patch',
diff --git a/pythonforandroid/recipes/python2/patches/fix-platform.patch b/pythonforandroid/recipes/python2/patches/fix-platform.patch
new file mode 100644
index 0000000000..a90f3c9b72
--- /dev/null
+++ b/pythonforandroid/recipes/python2/patches/fix-platform.patch
@@ -0,0 +1,71 @@
+diff -Naur Python-2.7.2.org/Lib/platform.py Python-2.7.2/Lib/platform.py
+--- Python-2.7.2.org/Lib/platform.py	2016-03-26 18:37:49.968335997 +0800
++++ Python-2.7.2/Lib/platform.py	2016-03-26 18:40:02.708338807 +0800
+@@ -160,35 +160,39 @@
+         # here to work around problems with Cygwin not being
+         # able to open symlinks for reading
+         executable = os.path.realpath(executable)
+-    f = open(executable,'rb')
+-    binary = f.read(chunksize)
+-    pos = 0
+-    while 1:
+-        m = _libc_search.search(binary,pos)
+-        if not m:
+-            binary = f.read(chunksize)
+-            if not binary:
+-                break
+-            pos = 0
+-            continue
+-        libcinit,glibc,glibcversion,so,threads,soversion = m.groups()
+-        if libcinit and not lib:
+-            lib = 'libc'
+-        elif glibc:
+-            if lib != 'glibc':
+-                lib = 'glibc'
+-                version = glibcversion
+-            elif glibcversion > version:
+-                version = glibcversion
+-        elif so:
+-            if lib != 'glibc':
++    try:
++        f = open(executable,'rb')
++        binary = f.read(chunksize)
++        pos = 0
++        while 1:
++            m = _libc_search.search(binary,pos)
++            if not m:
++                binary = f.read(chunksize)
++                if not binary:
++                    break
++                pos = 0
++                continue
++            libcinit,glibc,glibcversion,so,threads,soversion = m.groups()
++            if libcinit and not lib:
+                 lib = 'libc'
+-                if soversion > version:
+-                    version = soversion
+-                if threads and version[-len(threads):] != threads:
+-                    version = version + threads
+-        pos = m.end()
+-    f.close()
++            elif glibc:
++                if lib != 'glibc':
++                    lib = 'glibc'
++                    version = glibcversion
++                elif glibcversion > version:
++                    version = glibcversion
++            elif so:
++                if lib != 'glibc':
++                    lib = 'libc'
++                    if soversion > version:
++                        version = soversion
++                    if threads and version[-len(threads):] != threads:
++                        version = version + threads
++            pos = m.end()
++        f.close()
++    except:
++        pass
++        
+     return lib,version
+ 
+ def _dist_try_harder(distname,version,id):