cryptography now builds

wexi · wexi · commit 8d71dbe93a55 · 2017-12-02T22:30:34.000-05:00
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -553,13 +553,15 @@ def clean_build(self, arch=None):
         # doesn't persist in site-packages
         shutil.rmtree(self.ctx.python_installs_dir)
 
-    def install_libs(self, arch, *libs):
+    def install_libs(self, arch, *libs, **links):
         libs_dir = self.ctx.get_libs_dir(arch.arch)
         if not libs:
             warning('install_libs called with no libraries to install!')
             return
         args = libs + (libs_dir,)
         shprint(sh.cp, *args)
+        for lib, link in links.iteritems():
+            shprint(sh.ln, '-s', join(libs_dir, lib), join(libs_dir, link))
 
     def has_libs(self, arch, *libs):
         return all(map(lambda l: self.ctx.has_lib(arch.arch, l), libs))
@@ -879,8 +881,12 @@ def build_compiled_components(self, arch):
             hostpython = sh.Command(self.hostpython_location)
             if self.install_in_hostpython:
                 shprint(hostpython, 'setup.py', 'clean', '--all', _env=env)
+
             shprint(hostpython, 'setup.py', self.build_cmd, '-v',
                     _env=env, *self.setup_extra_args)
+
+            # hostpython('setup.py', self.build_cmd, '-v', _env=env, _fg=True)
+
             build_dir = glob.glob('build/lib.*')[0]
             shprint(sh.find, build_dir, '-name', '"*.o"', '-exec',
                     env['STRIP'], '{}', ';', _env=env)
diff --git a/pythonforandroid/recipes/cryptography/__init__.py b/pythonforandroid/recipes/cryptography/__init__.py
@@ -4,7 +4,7 @@
 class CryptographyRecipe(CompiledComponentsPythonRecipe):
     name = 'cryptography'
     version = 'master'
-    url = 'git+file:///home/enoch/cryptography'
+    url = 'git+https://github.com/pyca/cryptography.git'
     depends = ['host_cffi', 'host_cython', 'host_setuptools', 'host_sh',
                'idna', 'asn1crypto', 'six', 'cffi',
                'enum34', 'ipaddress', 'openssl']
@@ -17,7 +17,11 @@ def get_recipe_env(self, arch):
         dirs = recipe.get_include_dirs(arch)
         recipe = self.get_recipe('openssl', self.ctx)
         dirs += recipe.get_include_dirs(arch)
-        env['CFLAGS'] += ''.join([' -I' + dir for dir in dirs])
+        # Required: ln -s \
+        # ~/Android/Sdk/ndk-bundle/sysroot/usr/include/arm-linux-androideabi/asm/unistd-common.h \
+        # ~/Android/CrystaX/platforms/android-19/arch-arm/usr/include
+        env['CFLAGS'] += (' -include unistd-common.h' +
+                          ''.join([' -I' + dir for dir in dirs]))
         return env
 
 
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -8,7 +8,7 @@
 class KivyRecipe(CythonRecipe):
     name = 'kivy'
     version = 'master'
-    url = 'git+file:///home/enoch/kivy'
+    url = 'git+https://github.com/kivy/kivy.git'
 
     depends = [('sdl2', 'pygame'), 'pyjnius']
 
diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -60,9 +60,10 @@ def build_arch(self, arch):
                 if all(map(check_crypto, ('SSLeay', 'MD5_Transform', 'MD4_Init'))):
                     break
                 shprint(sh.make, 'clean', _env=env)
-
-            self.install_libs(arch, 'libssl' + self.version + '.so',
-                              'libcrypto' + self.version + '.so')
+            libn = 'libssl', 'libcrypto'
+            libs = [lib + self.version + '.so' for lib in libn]
+            lnks = {lib + self.version + '.so': lib + '.so' for lib in libn}
+            self.install_libs(arch, *libs, **lnks)
 
     def get_include_dirs(self, arch):
         return [join(self.get_build_dir(arch.arch), 'include')]
