s3coderz
diff --git a/‎pythonforandroid/recipes/twisted/__init__.py‎
Lines changed: 0 additions & 67 deletions b/‎pythonforandroid/recipes/twisted/__init__.py‎
Lines changed: 0 additions & 67 deletions
diff --git a/‎pythonforandroid/toolchain.py‎
Lines changed: 28 additions & 7 deletions b/‎pythonforandroid/toolchain.py‎
Lines changed: 28 additions & 7 deletions
@@ -1896,9 +1896,25 @@ def get_jni_dir(self):
 
 
 class PythonRecipe(Recipe):
-    site_packages_name = None  # The name of the module in
-                               # site_packages (i.e. as a python
-                               # module)
+    site_packages_name = None
+    '''The name of the module's folder when installed in the Python
+    site-packages (e.g. for pyjnius it is 'jnius')'''
+
+    call_hostpython_via_targetpython = True
+    '''If True, tries to install the module using the hostpython binary
+    copied to the target (normally arm) python build dir. However, this
+    will fail if the module tries to import e.g. _io.so. Set this to False
+    to call hostpython from its own build dir, installing the module in
+    the right place via arguments to setup.py. However, this may not set
+    the environment correctly and so False is not the default.'''
+
+    @property
+    def hostpython_location(self):
+        if not self.call_hostpython_via_targetpython:
+            return join(
+                Recipe.get_recipe('hostpython2', self.ctx).get_build_dir(
+                    'armeabi'), 'hostpython')
+        return self.ctx.hostpython
 
     def should_build(self):
         # AND: This should be different for each arch and use some
@@ -1914,8 +1930,6 @@ def should_build(self):
         info('{} apparently isn\'t already in site-packages'.format(name))
         return True
 
-
-
     def build_arch(self, arch):
         '''Install the Python module by calling setup.py install with
         the target Python dir.'''
@@ -1938,9 +1952,16 @@ def install_python_package(self, name=None, env=None, is_dir=True):
         info('Installing {} into site-packages'.format(self.name))
 
         with current_directory(self.get_build_dir(arch.arch)):
-            hostpython = sh.Command(self.ctx.hostpython)
+            # hostpython = sh.Command(self.ctx.hostpython)
+            hostpython = sh.Command(self.hostpython_location)
 
-            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+            if self.call_hostpython_via_targetpython:
+                shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+            else:
+                shprint(hostpython, 'setup.py', 'install', '-O2',
+                        '--root={}'.format(self.ctx.get_python_install_dir()),
+                        '--install-lib=lib/python2.7/site-packages',
+                        _env=env)  # AND: Hardcoded python2.7 needs fixing
 
 
 class CompiledComponentsPythonRecipe(PythonRecipe):