PR snagging

olymk2 · olymk2 · commit 6c352dd351c4 · 2015-05-10T15:54:01.000+01:00
diff --git a/recipes/python/patches/ctypes-find-library.patch b/recipes/python/patches/ctypes-find-library.patch
@@ -1,251 +1,28 @@
 diff -ur Python-2.7.2.orig/Lib/ctypes/util.py Python-2.7.2/Lib/ctypes/util.py
 --- Python-2.7.2.orig/Lib/ctypes/util.py	2011-06-11 16:46:24.000000000 +0100
-+++ Python-2.7.2/Lib/ctypes/util.py	2015-05-10 10:37:49.258720992 +0100
-@@ -3,237 +3,16 @@
- ######################################################################
- import sys, os
++++ Python-2.7.2/Lib/ctypes/util.py	2015-05-10 15:50:18.906203529 +0100
+@@ -71,7 +71,21 @@
+     def find_library(name):
+         return name
  
--# find_library(name) returns the pathname of a library, or None.
--if os.name == "nt":
--
--    def _get_build_version():
--        """Return the version of MSVC that was used to build Python.
--
--        For Python 2.3 and up, the version number is included in
--        sys.version.  For earlier versions, assume the compiler is MSVC 6.
--        """
--        # This function was copied from Lib/distutils/msvccompiler.py
--        prefix = "MSC v."
--        i = sys.version.find(prefix)
--        if i == -1:
--            return 6
--        i = i + len(prefix)
--        s, rest = sys.version[i:].split(" ", 1)
--        majorVersion = int(s[:-2]) - 6
--        minorVersion = int(s[2:3]) / 10.0
--        # I don't think paths are affected by minor version in version 6
--        if majorVersion == 6:
--            minorVersion = 0
--        if majorVersion >= 6:
--            return majorVersion + minorVersion
--        # else we don't know what version of the compiler this is
--        return None
--
--    def find_msvcrt():
--        """Return the name of the VC runtime dll"""
--        version = _get_build_version()
--        if version is None:
--            # better be safe than sorry
--            return None
--        if version <= 6:
--            clibname = 'msvcrt'
--        else:
--            clibname = 'msvcr%d' % (version * 10)
--
--        # If python was built with in debug mode
--        import imp
--        if imp.get_suffixes()[0][0] == '_d.pyd':
--            clibname += 'd'
--        return clibname+'.dll'
--
--    def find_library(name):
--        if name in ('c', 'm'):
--            return find_msvcrt()
--        # See MSDN for the REAL search order.
--        for directory in os.environ['PATH'].split(os.pathsep):
--            fname = os.path.join(directory, name)
--            if os.path.isfile(fname):
--                return fname
--            if fname.lower().endswith(".dll"):
--                continue
--            fname = fname + ".dll"
--            if os.path.isfile(fname):
--                return fname
--        return None
--
--if os.name == "ce":
--    # search path according to MSDN:
--    # - absolute path specified by filename
--    # - The .exe launch directory
--    # - the Windows directory
--    # - ROM dll files (where are they?)
--    # - OEM specified search path: HKLM\Loader\SystemPath
--    def find_library(name):
--        return name
--
 -if os.name == "posix" and sys.platform == "darwin":
--    from ctypes.macholib.dyld import dyld_find as _dyld_find
--    def find_library(name):
--        possible = ['lib%s.dylib' % name,
--                    '%s.dylib' % name,
--                    '%s.framework/%s' % (name, name)]
--        for name in possible:
--            try:
--                return _dyld_find(name)
--            except ValueError:
--                continue
--        return None
--
--elif os.name == "posix":
--    # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
--    import re, tempfile, errno
--
--    def _findLib_gcc(name):
--        expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
--        fdout, ccout = tempfile.mkstemp()
--        os.close(fdout)
--        cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
--              '$CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
--        try:
--            f = os.popen(cmd)
--            try:
--                trace = f.read()
--            finally:
--                rv = f.close()
--        finally:
--            try:
--                os.unlink(ccout)
--            except OSError, e:
--                if e.errno != errno.ENOENT:
--                    raise
--        if rv == 10:
--            raise OSError, 'gcc or cc command not found'
--        res = re.search(expr, trace)
--        if not res:
--            return None
--        return res.group(0)
--
--
--    if sys.platform == "sunos5":
--        # use /usr/ccs/bin/dump on solaris
--        def _get_soname(f):
--            if not f:
--                return None
--            cmd = "/usr/ccs/bin/dump -Lpv 2>/dev/null " + f
--            f = os.popen(cmd)
--            try:
--                data = f.read()
--            finally:
--                f.close()
--            res = re.search(r'\[.*\]\sSONAME\s+([^\s]+)', data)
--            if not res:
--                return None
--            return res.group(1)
--    else:
--        def _get_soname(f):
--            # assuming GNU binutils / ELF
--            if not f:
--                return None
--            cmd = 'if ! type objdump >/dev/null 2>&1; then exit 10; fi;' \
--                  "objdump -p -j .dynamic 2>/dev/null " + f
--            f = os.popen(cmd)
--            dump = f.read()
--            rv = f.close()
--            if rv == 10:
--                raise OSError, 'objdump command not found'
--            f = os.popen(cmd)
--            try:
--                data = f.read()
--            finally:
--                f.close()
--            res = re.search(r'\sSONAME\s+([^\s]+)', data)
--            if not res:
--                return None
--            return res.group(1)
--
--    if (sys.platform.startswith("freebsd")
--        or sys.platform.startswith("openbsd")
--        or sys.platform.startswith("dragonfly")):
--
--        def _num_version(libname):
--            # "libxyz.so.MAJOR.MINOR" => [ MAJOR, MINOR ]
--            parts = libname.split(".")
--            nums = []
--            try:
--                while parts:
--                    nums.insert(0, int(parts.pop()))
--            except ValueError:
--                pass
--            return nums or [ sys.maxint ]
--
--        def find_library(name):
--            ename = re.escape(name)
--            expr = r':-l%s\.\S+ => \S*/(lib%s\.\S+)' % (ename, ename)
--            f = os.popen('/sbin/ldconfig -r 2>/dev/null')
--            try:
--                data = f.read()
--            finally:
--                f.close()
--            res = re.findall(expr, data)
--            if not res:
--                return _get_soname(_findLib_gcc(name))
--            res.sort(cmp= lambda x,y: cmp(_num_version(x), _num_version(y)))
--            return res[-1]
--
--    else:
--
--        def _findLib_ldconfig(name):
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            expr = r'/[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
--            f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')
--            try:
--                data = f.read()
--            finally:
--                f.close()
--            res = re.search(expr, data)
--            if not res:
--                # Hm, this works only for libs needed by the python executable.
--                cmd = 'ldd %s 2>/dev/null' % sys.executable
--                f = os.popen(cmd)
--                try:
--                    data = f.read()
--                finally:
--                    f.close()
--                res = re.search(expr, data)
--                if not res:
--                    return None
--            return res.group(0)
--
--        def _findSoname_ldconfig(name):
--            import struct
--            if struct.calcsize('l') == 4:
--                machine = os.uname()[4] + '-32'
--            else:
--                machine = os.uname()[4] + '-64'
--            mach_map = {
--                'x86_64-64': 'libc6,x86-64',
--                'ppc64-64': 'libc6,64bit',
--                'sparc64-64': 'libc6,64bit',
--                's390x-64': 'libc6,64bit',
--                'ia64-64': 'libc6,IA-64',
--                }
--            abi_type = mach_map.get(machine, 'libc6')
--
--            # XXX assuming GLIBC's ldconfig (with option -p)
--            expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
--                   % (abi_type, re.escape(name))
--            f = os.popen('/sbin/ldconfig -p 2>/dev/null')
--            try:
--                data = f.read()
--            finally:
--                f.close()
--            res = re.search(expr, data)
--            if not res:
--                return None
--            return res.group(1)
--
--        def find_library(name):
--            return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-+def find_library(name):
-+    """ hack to find librarys for kivy and android 
-+    split the path and get the first parts which will give us 
-+    the app path something like /data/data/org.app.foo/"""
-+    app_root = os.path.abspath('./').split(os.path.sep)[0:4]
-+    lib_search = os.path.sep.join(app_root) + os.path.sep + 'lib'
-+    for filename in os.listdir(lib_search):
-+        if filename.endswith('.so') and name in filename:
-+            return lib_search + os.path.sep + filename
-+    return None
- 
- ################################################################
- # test code
++# this test is for android specifically shoudl match here and ignore any
++# of the other platform tests below
++if os.name == "posix":
++    def find_library(name):
++        """ hack to find librarys for kivy and android 
++        split the path and get the first parts which will give us 
++        the app path something like /data/data/org.app.foo/"""
++        app_root = os.path.abspath('./').split(os.path.sep)[0:4]
++        lib_search = os.path.sep.join(app_root) + os.path.sep + 'lib'
++        for filename in os.listdir(lib_search):
++            if filename.endswith('.so') and name in filename:
++                return lib_search + os.path.sep + filename
++        return None
++
++elif os.name == "posix" and sys.platform == "darwin":
+     from ctypes.macholib.dyld import dyld_find as _dyld_find
+     def find_library(name):
+         possible = ['lib%s.dylib' % name,
+Only in Python-2.7.2/Lib/ctypes: util.py.save
+Only in Python-2.7.2/Lib/ctypes: util.py.save.1
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -32,7 +32,7 @@ function prebuild_python() {
 	try patch -p1 < $RECIPE_python/patches/fix-remove-corefoundation.patch
 	try patch -p1 < $RECIPE_python/patches/fix-dynamic-lookup.patch
 	try patch -p1 < $RECIPE_python/patches/fix-dlfcn.patch
-    try patch -p1 < $RECIPE_python/patches/ctypes-find-library.patch
+	try patch -p1 < $RECIPE_python/patches/ctypes-find-library.patch
 
 	system=$(uname -s)
 	if [ "X$system" == "XDarwin" ]; then
@@ -106,7 +106,7 @@ function build_python() {
 
 	# FIXME, the first time, we got a error at:
 	# python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-    # /home/tito/code/python-for-android/build/python/Python-2.7.2/python: 1: Syntax error: word unexpected (expecting ")")
+	# /home/tito/code/python-for-android/build/python/Python-2.7.2/python: 1: Syntax error: word unexpected (expecting ")")
 	# because at this time, python is arm, not x86. even that, why /usr/include/netinet/in.h is used ?
 	# check if we can avoid this part.
 
diff --git a/src/src/org/renpy/android/PythonService.java b/src/src/org/renpy/android/PythonService.java
@@ -85,11 +85,16 @@ public void run(){
         System.loadLibrary("python2.7");
         System.loadLibrary("application");
         System.loadLibrary("sdl_main");
-	System.loadLibrary("ctypes");
+        
 
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_io.so");
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
-	System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
+        
+        try {
+            System.loadLibrary("ctypes");
+            System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
+        } catch(UnsatisfiedLinkError e) {
+        }
 
         try {
             System.loadLibrary("sqlite3");
