Did basic changes for Python3.8 support

Author: inclement

pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java

@@ -44,6 +44,7 @@ protected static ArrayList<String> getLibraries(File libsDir) {
         libsList.add("python3.5m");
         libsList.add("python3.6m");
         libsList.add("python3.7m");
+        libsList.add("python3.8m");
         libsList.add("main");
         return libsList;
     }
@@ -64,7 +65,7 @@ public static void loadLibraries(File filesDir, File libsDir) {
                 // load, and it has failed, give a more
                 // general error
                 Log.v(TAG, "Library loading error: " + e.getMessage());
-                if (lib.startsWith("python3.7") && !foundPython) {
+                if (lib.startsWith("python3.8") && !foundPython) {
                     throw new java.lang.RuntimeException("Could not load any libpythonXXX.so");
                 } else if (lib.startsWith("python")) {
                     continue;
@@ -81,7 +82,7 @@ public static void loadLibraries(File filesDir, File libsDir) {
         } catch(UnsatisfiedLinkError e) {
             Log.v(TAG, "Failed to load _io.so or unicodedata.so...but that's okay.");
         }
-        
+
         try {
             // System.loadLibrary("ctypes");
             System.load(filesDirPath + "/lib/python2.7/lib-dynload/_ctypes.so");
@@ -92,4 +93,3 @@ public static void loadLibraries(File filesDir, File libsDir) {
         Log.v(TAG, "Loaded everything!");
     }
 }
-

pythonforandroid/python.py

@@ -438,10 +438,19 @@ def build_arch(self, arch):
                 if not exists('config.status'):
                     shprint(sh.Command(join(recipe_build_dir, 'configure')))
 
-            # Create the Setup file. This copying from Setup.dist
-            # seems to be the normal and expected procedure.
-            shprint(sh.cp, join('Modules', 'Setup.dist'),
-                    join(build_dir, 'Modules', 'Setup'))
+            # Create the Setup file. This copying from Setup.dist is
+            # the normal and expected procedure before Python 3.8, but
+            # after this the file with default options is already named "Setup"
+            setup_dist_location = join('Modules', 'Setup.dist')
+            if exists(setup_dist_location):
+                shprint(sh.cp, join('Modules', 'Setup.dist'),
+                        join(build_dir, 'Modules', 'Setup'))
+            else:
+                # Check the expected file does exist
+                setup_location = join('Modules', 'Setup')
+                if not exists(setup_location):
+                    raise BuildInterruptingException(
+                        "Could not find Setup.dist or Setup in Python build")
 
             shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir)
 

pythonforandroid/recipes/hostpython3/__init__.py

@@ -9,7 +9,7 @@ class Hostpython3Recipe(HostPythonRecipe):
         Refactored into  the new class
         :class:`~pythonforandroid.python.HostPythonRecipe`
     '''
-    version = '3.7.1'
+    version = '3.8.1'
     name = 'hostpython3'
     conflicts = ['hostpython2']
 

pythonforandroid/recipes/python3/__init__.py

@@ -18,14 +18,17 @@ class Python3Recipe(GuestPythonRecipe):
         :class:`~pythonforandroid.python.GuestPythonRecipe`
     '''
 
-    version = '3.7.1'
+    version = '3.8.1'
     url = 'https://www.python.org/ftp/python/{version}/Python-{version}.tgz'
     name = 'python3'
 
-    patches = ['patches/fix-ctypes-util-find-library.patch',
-               'patches/fix-zlib-version.patch']
+    # patches = ['patches/fix-ctypes-util-find-library.patch',
+    #            'patches/fix-zlib-version.patch']
+
+    patches = ['patches/py381.patch']
 
     if sh.which('lld') is not None:
+        raise RuntimeError("!!!")
         patches = patches + ["patches/remove-fix-cortex-a8.patch"]
 
     depends = ['hostpython3', 'sqlite3', 'openssl', 'libffi']