Got python3 recipe to the point of configure working

inclement · inclement · commit 901a153ef373 · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -712,6 +712,13 @@ class PythonRecipe(Recipe):
     setup_extra_args = []
     '''List of extra arugments to pass to setup.py'''
 
+    def __init__(self, *args, **kwargs):
+        super(PythonRecipe, self).__init__(*args, **kwargs)
+        depends = self.depends
+        depends.append(('python2', 'python3', 'python3crystax'))
+        depends = list(set(depends))
+        self.depends = depends
+
     def clean_build(self, arch=None):
         super(PythonRecipe, self).clean_build(arch=arch)
         name = self.folder_name
diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py
@@ -23,31 +23,32 @@ def get_build_dir(self, arch=None):
 
     def build_arch(self, arch):
         recipe_build_dir = self.get_build_dir(arch.arch)
-        with current_directory(recipe_build_dir):
-            # Create a subdirectory to actually perform the build
-            build_dir = join(recipe_build_dir, 'native-build')
-            ensure_dir(build_dir)
 
-            env = {}  # The command line environment we will use
+        # Create a subdirectory to actually perform the build
+        build_dir = join(recipe_build_dir, 'native-build')
+        ensure_dir(build_dir)
 
+        if not exists(join(build_dir, 'python')):
+            with current_directory(recipe_build_dir):
+                env = {}  # The command line environment we will use
 
-            # Configure the build
-            with current_directory(build_dir):
-                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.
-            assert exists(join(build_dir, 'Modules')), (
-                'Expected dir {} does not exist'.format(join(build_dir, 'Modules')))
-            shprint(sh.cp, join('Modules', 'Setup.dist'), join(build_dir, 'Modules', 'Setup'))
+                # Configure the build
+                with current_directory(build_dir):
+                    if not exists('config.status'):
+                        shprint(sh.Command(join(recipe_build_dir, 'configure')))
 
-            result = shprint(sh.make, '-C', build_dir)
+                # Create the Setup file. This copying from Setup.dist
+                # seems to be the normal and expected procedure.
+                assert exists(join(build_dir, 'Modules')), (
+                    'Expected dir {} does not exist'.format(join(build_dir, 'Modules')))
+                shprint(sh.cp, join('Modules', 'Setup.dist'), join(build_dir, 'Modules', 'Setup'))
+
+                result = shprint(sh.make, '-C', build_dir)
+        else:
+            info('Skipping hostpython3 build as it has already been completed')
 
         self.ctx.hostpython = join(build_dir, 'python')
         self.ctx.hostpgen = '/usr/bin/false'  # is this actually used for anything?
 
-        print('result is', result)
-        exit(1)
-
 recipe = Hostpython3Recipe()
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -2,7 +2,9 @@
 from pythonforandroid.toolchain import shprint, current_directory, info
 from pythonforandroid.patching import (is_darwin, is_api_gt,
                                        check_all, is_api_lt, is_ndk)
+from pythonforandroid.util import ensure_dir
 from os.path import exists, join, realpath
+from os import environ
 import sh
 
 
@@ -13,6 +15,82 @@ class Python3Recipe(TargetPythonRecipe):
 
     depends = ['hostpython3']
     conflicts = ['python3crystax', 'python2']
-    opt_depends = ['openssl', 'sqlite3']
+    # opt_depends = ['openssl', 'sqlite3']
+
+    def build_arch(self, arch):
+        recipe_build_dir = self.get_build_dir(arch.arch)
+        
+        # Create a subdirectory to actually perform the build
+        build_dir = join(recipe_build_dir, 'android-build')
+        ensure_dir(build_dir)
+
+        # TODO: Get these dynamically, like bpo-30386 does
+        sys_prefix = '/usr/local'
+        sys_exec_prefix = '/usr/local'
+
+        # Skipping "Ensure that nl_langinfo is broken" from the original bpo-30386
+
+        with current_directory(build_dir):
+            env = environ.copy()
+
+
+            # TODO: Get this information from p4a's arch system
+            android_host = 'arm-linux-androideabi'
+            android_build = sh.Command(join(recipe_build_dir, 'config.guess'))().stdout.strip().decode('utf-8')
+            platform_dir = join(self.ctx.ndk_dir, 'platforms', 'android-19', 'arch-arm')
+            toolchain = '{android_host}-4.9'.format(android_host=android_host)
+            toolchain = join(self.ctx.ndk_dir, 'toolchains', toolchain, 'prebuilt', 'linux-x86_64')
+            CC = '{clang} -target {target} -gcc-toolchain {toolchain}'.format(
+                clang=join(self.ctx.ndk_dir, 'toolchains', 'llvm', 'prebuilt', 'linux-x86_64', 'bin', 'clang'),
+                target='armv7-none-linux-androideabi',
+                toolchain=toolchain)
+
+            AR = join(toolchain, 'bin', android_host) + '-ar'
+            LD = join(toolchain, 'bin', android_host) + '-ld'
+            RANLIB = join(toolchain, 'bin', android_host) + '-ranlib'
+            READELF = join(toolchain, 'bin', android_host) + '-readelf'
+            STRIP = join(toolchain, 'bin', android_host) + '-strip --strip-debug --strip-unneeded'
+
+            env['CC'] = CC
+            env['AR'] = AR
+            env['LD'] = LD
+            env['RANLIB'] = RANLIB
+            env['READELF'] = READELF
+            env['STRIP'] = STRIP
+
+            ndk_flags = '--sysroot={ndk_sysroot} -D__ANDROID_API__=19 -isystem {ndk_android_host}'.format(
+                ndk_sysroot=join(self.ctx.ndk_dir, 'sysroot'),
+                ndk_android_host=join(self.ctx.ndk_dir, 'sysroot', 'usr', 'include', android_host))
+            sysroot = join(self.ctx.ndk_dir, 'platforms', 'android-19', 'arch-arm')
+            env['CFLAGS'] = env.get('CFLAGS', '') + ' ' + ndk_flags
+            env['CPPFLAGS'] = env.get('CPPFLAGS', '') + ' ' + ndk_flags
+            env['LDFLAGS'] = env.get('LDFLAGS', '') + ' --sysroot={} -march=armv7-a -Wl,--fix-cortex-a8'.format(sysroot)
+
+            print('CPPflags', env['CPPFLAGS'])
+            print('LDFLAGS', env['LDFLAGS'])
+
+            print('LD is', env['LD'])
+
+            shprint(sh.Command(join(recipe_build_dir, 'configure')),
+                    *(' '.join(('--host={android_host}',
+                                '--build={android_build}',
+                                '--enable-shared',
+                                '--disable-ipv6',
+                                'ac_cv_file__dev_ptmx=yes',
+                                'ac_cv_file__dev_ptc=no',
+                                '--without-ensurepip',
+                                'ac_cv_little_endian_double=yes',
+                                '--prefix={prefix}',
+                                '--exec-prefix={exec_prefix}')).format(
+                                    android_host=android_host,
+                                    android_build=android_build,
+                                    prefix=sys_prefix,
+                                    exec_prefix=sys_exec_prefix)).split(' '), _env=env)
+
+        #     if not exists('config.status'):
+                
+
+        #     shprint(sh.make, '-C', build_dir)
+            
 
 recipe = Python3Recipe()
diff --git a/pythonforandroid/recipes/six/__init__.py b/pythonforandroid/recipes/six/__init__.py
@@ -5,6 +5,7 @@
 class SixRecipe(PythonRecipe):
     version = '1.9.0'
     url = 'https://pypi.python.org/packages/source/s/six/six-{version}.tar.gz'
+    depends = [('python2', 'python3', 'python3crystax')]
 
 
 recipe = SixRecipe()
