Made pygame build work (including other fixes)

Author: inclement

recipes/pygame/__init__.py

@@ -1,5 +1,5 @@
 
-from toolchain import PythonRecipe, shprint
+from toolchain import PythonRecipe, shprint, ArchAndroid, current_directory
 from os.path import exists, join
 import sh
 
@@ -13,10 +13,39 @@ def prebuild_armeabi(self):
         if exists(join(self.get_build_dir('armeabi'), '.patched')):
             print('Pygame already patched, skipping.')
             return
+        shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
+                join(self.get_actual_build_dir('armeabi'), 'Setup'))
         self.apply_patch(join('patches', 'fix-surface-access.patch'))
         self.apply_patch(join('patches', 'fix-array-surface.patch'))
         shprint(sh.touch, join(self.get_build_dir('armeabi'), '.patched'))
 
+    def build_armeabi(self):
+        # AND: I'm going to ignore any extra pythonrecipe or cythonrecipe behaviour for now
+        
+        env = ArchAndroid(self.ctx).get_env()
+        
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/jpeg'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/sdl/include -I{jni_path}/sdl_mixer'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/sdl_ttf -I{jni_path}/sdl_image'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+        print('pygame cflags', env['CFLAGS'])
+
+        
+        env['LDFLAGS'] = env['LDFLAGS'] + ' -L{libs_path} -L{src_path}/obj/local/{arch} -lm -lz'.format(
+            libs_path=self.ctx.libs_dir, src_path=self.ctx.bootstrap.build_dir, arch=env['ARCH'])
+        print('pygame ldflags', env['LDFLAGS'])
+
+        env['LDSHARED'] = env['LIBLINK']
+
+        with current_directory(self.get_actual_build_dir('armeabi')):
+            print('hostpython is', self.ctx.hostpython)
+            hostpython = sh.Command(self.ctx.hostpython)
+            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+
+            print('strip is', env['STRIP'])
+            exit(1)
 
 
 recipe = PygameRecipe()

recipes/python2/__init__.py

@@ -40,6 +40,9 @@ def build_armeabi(self):
             print('sqlite or openssl support not yet enabled in python recipe')
             exit(1)
 
+        self.ctx.hostpython = join(self.ctx.build_dir, 'python-install',
+                                   'bin', 'python.host')
+
         if exists(join(self.ctx.libs_dir, 'libpython2.7.so')):
             print('libpython2.7.so already exists, skipping python build.')
             return
@@ -96,6 +99,14 @@ def build_armeabi(self):
 
             print('Ready to copy .so for python arm')
             shprint(sh.cp, 'libpython2.7.so', self.ctx.libs_dir)
+
+            print('Copying hostpython binary to targetpython folder')
+            shprint(sh.cp, self.ctx.hostpython,
+                    join(self.ctx.build_dir, 'python-install', 'bin',
+                         'python.host'))
+            self.ctx.hostpython = join(self.ctx.build_dir, 'python-install',
+                                       'bin', 'python.host')
+                    
 
             # reduce python?
             for dir_name in ('test', join('json', 'tests'), 'lib-tk',

toolchain.py

@@ -258,7 +258,12 @@ def get_env(self):
         env['BUILDLIB_PATH'] = join(hostpython_recipe.get_actual_build_dir('armeabi'),
                                     'build', 'lib.linux-{}-2.7'.format(uname()[-1]))
 
+
+        # AND: This stuff is set elsewhere in distribute.sh. Does that matter?
         env['ARCH'] = self.arch
+        env['LIBLINK_PATH'] = join(self.ctx.build_dir, 'other_builds')
+        env['LIBLINK'] = join(self.ctx.bootstrap.build_dir, 'tools', 'liblink')
+        env['BIGLINK'] = join(self.ctx.bootstrap.build_dir, 'tools', 'biglink')
 
         return env