Made changes to apparently make ctypes work

inclement · inclement · commit 9bf0612ca4c4 · 2015-10-04T14:33:35.000+01:00
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -77,8 +77,8 @@ def run_distribute(self):
                 for filename in glob.glob('config/libpython*.a'):
                     shprint(sh.rm, '-f', filename)
                 shprint(sh.rm, '-rf', 'config/python.o')
-                shprint(sh.rm, '-rf', 'lib-dynload/_ctypes_test.so')
-                shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
+                # shprint(sh.rm, '-rf', 'lib-dynload/_ctypes_test.so')
+                # shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
 
 
         info('Stripping libraries')
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -73,7 +73,7 @@ public void loadLibraries() {
         System.load(getFilesDir() + "/lib/python2.7/lib-dynload/unicodedata.so");
         
         try {
-            System.loadLibrary("ctypes");
+            // System.loadLibrary("ctypes");
             System.load(getFilesDir() + "/lib/python2.7/lib-dynload/_ctypes.so");
         } catch(UnsatisfiedLinkError e) {
             Log.v(TAG, "Unsatisfied linker when loading ctypes");
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -66,9 +66,18 @@ def build_armeabi(self):
 
             env = ArchAndroid(self.ctx).get_env()
 
+            # AND: Should probably move these to get_recipe_env for
+            # neatness, but the whole recipe needs tidying along these
+            # lines
+            env['HOSTARCH'] = 'arm-eabi'
+            env['BUILDARCH'] = shprint(sh.gcc, '-dumpmachine').stdout.split('\n')[0]
+            env['CFLAGS'] = ' '.join([env['CFLAGS'], '-DNO_MALLINFO'])
+
             configure = sh.Command('./configure')
             # AND: OFLAG isn't actually set, should it be?
-            shprint(configure, '--host=arm-eabi',
+            shprint(configure,
+                    '--host={}'.format(env['HOSTARCH']),
+                    '--build={}'.format(env['BUILDARCH']),
                     # 'OPT={}'.format(env['OFLAG']),
                     '--prefix={}'.format(join(self.ctx.build_dir, 'python-install')),
                     '--enable-shared',
@@ -111,8 +120,8 @@ def build_armeabi(self):
 
             print('Ready to copy .so for python arm')
             shprint(sh.cp, 'libpython2.7.so', self.ctx.libs_dir)
-            for filen in glob.glob('build/lib.*-2.7/_ctypes*.so'):
-                shprint(sh.cp, '-a', filen, self.ctx.libs_dir)
+            # for filen in glob.glob('build/lib.*-2.7/_ctypes*.so'):
+            #     shprint(sh.cp, '-a', filen, self.ctx.libs_dir)
 
             print('Copying hostpython binary to targetpython folder')
             shprint(sh.cp, self.ctx.hostpython,
@@ -131,5 +140,8 @@ def build_armeabi(self):
                 shprint(sh.rm, '-rf', join(self.ctx.build_dir, 'python-install',
                                            'lib', 'python2.7', dir_name))
 
+        # print('python2 build done, exiting for debug')
+        # exit(1)
+
 
 recipe = Python2Recipe()
diff --git a/pythonforandroid/recipes/python2/patches/Python-2.7.2-xcompile.patch b/pythonforandroid/recipes/python2/patches/Python-2.7.2-xcompile.patch
@@ -192,3 +192,14 @@ diff -urN Python-2.7.2/setup.py ltib/rpm/BUILD/Python-2.7.2/setup.py
  
                  res = os.system(cmd)
                  if res or not os.path.exists(ffi_configfile):
+--- Python-2.6.6.orig//Lib/plat-linux3/regen 1970-01-01 01:00:00.000000000 +0100
++++ Python-2.6.6/Lib/plat-linux3/regen 2001-08-09 14:48:17.000000000 +0200
+@@ -0,0 +1,8 @@
++#! /bin/sh
++case `uname` in
++Linux*) ;;
++*) echo Probably not on a Linux system 1>&2
++ exit 1;;
++esac
++set -v
++h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h
