Adapt sdl2's stuff to the new python2's build system

Author: opacam

pythonforandroid/bootstraps/sdl2/__init__.py

@@ -33,26 +33,11 @@ def run_distribute(self):
         with current_directory(self.dist_dir):
             info("Copying Python distribution")
 
-            hostpython = sh.Command(self.ctx.hostpython)
-            if self.ctx.python_recipe.name == 'python2':
-                try:
-                    shprint(hostpython, '-OO', '-m', 'compileall',
-                            python_install_dir,
-                            _tail=10, _filterout="^Listing")
-                except sh.ErrorReturnCode:
-                    pass
-                if 'python2' in self.ctx.recipe_build_order and not exists('python-install'):
-                    shprint(
-                        sh.cp, '-a', python_install_dir, './python-install')
-
             self.distribute_libs(arch, [self.ctx.get_libs_dir(arch.arch)])
             self.distribute_javaclasses(self.ctx.javaclass_dir,
                                         dest_dir=join("src", "main", "java"))
 
             python_bundle_dir = join('_python_bundle', '_python_bundle')
-            if 'python2' in self.ctx.recipe_build_order:
-                # Python 2 is a special case with its own packaging location
-                python_bundle_dir = 'private'
             ensure_dir(python_bundle_dir)
 
             site_packages_dir = self.ctx.python_recipe.create_python_bundle(

pythonforandroid/bootstraps/sdl2/build/build.py

@@ -24,7 +24,8 @@
 # Try to find a host version of Python that matches our ARM version.
 PYTHON = join(curdir, 'python-install', 'bin', 'python.host')
 if not exists(PYTHON):
-    print('Could not find hostpython, will not compile to .pyo (this is normal with python3)')
+    print('Could not find hostpython, will not compile to .pyo '
+          '(this is normal with python2 and python3)')
     PYTHON = None
 
 BLACKLIST_PATTERNS = [
@@ -126,7 +127,8 @@ def make_python_zip():
 
     if not exists('private'):
         print('No compiled python is present to zip, skipping.')
-        print('this should only be the case if you are using the CrystaX python or python3')
+        print('this should only be the case if you are using'
+              'the CrystaX python, python2 or python3')
         return
 
     global python_files

pythonforandroid/recipes/sdl2/__init__.py

@@ -24,12 +24,12 @@ def get_recipe_env(self, arch=None):
         env['PYTHON_INCLUDE_ROOT'] = self.ctx.python_recipe.include_root(arch.arch)
         env['PYTHON_LINK_ROOT'] = self.ctx.python_recipe.link_root(arch.arch)
 
-        if 'python2' in self.ctx.recipe_build_order:
-            env['EXTRA_LDLIBS'] = ' -lpython2.7'
-
-        if 'python3' in self.ctx.recipe_build_order:
-            env['EXTRA_LDLIBS'] = ' -lpython{}m'.format(
+        if 'python2' in self.ctx.recipe_build_order or \
+                'python3' in self.ctx.recipe_build_order:
+            env['EXTRA_LDLIBS'] = ' -lpython{}'.format(
                 self.ctx.python_recipe.major_minor_version_string)
+            if 'python3' in self.ctx.recipe_build_order:
+                env['EXTRA_LDLIBS'] += 'm'
 
         env['APP_ALLOW_MISSING_DEPS'] = 'true'
         return env