numpy should be installed also on hostpython for scipy

Author: misl6

pythonforandroid/recipes/numpy/__init__.py

@@ -13,7 +13,7 @@ class NumpyRecipe(CompiledComponentsPythonRecipe):
     url = 'https://pypi.python.org/packages/source/n/numpy/numpy-{version}.zip'
     site_packages_name = 'numpy'
     depends = ['setuptools', 'cython']
-    install_in_hostpython = False
+    install_in_hostpython = True
     call_hostpython_via_targetpython = False
 
     patches = [
@@ -40,9 +40,6 @@ def _build_compiled_components(self, arch):
 
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):
-            hostpython = sh.Command(self.real_hostpython_location)
-            if self.install_in_hostpython:
-                shprint(hostpython, 'setup.py', 'clean', '--all', '--force', _env=env)
             hostpython = sh.Command(self.hostpython_location)
             shprint(hostpython, 'setup.py', self.build_cmd, '-v',
                     _env=env, *self.setup_extra_args)
@@ -68,5 +65,10 @@ def rebuild_compiled_components(self, arch, env):
         self._rebuild_compiled_components(arch, env)
         self.setup_extra_args = []
 
+    def get_hostrecipe_env(self, arch):
+        env = super().get_hostrecipe_env(arch)
+        env['RANLIB'] = sh.which('ranlib')
+        return env
+
 
 recipe = NumpyRecipe()

pythonforandroid/recipes/scipy/__init__.py

@@ -56,8 +56,8 @@ def get_recipe_env(self, arch):
         # compilers
         env['F77'] = f'{GCC}/bin/{prefix}-gfortran'
         env['F90'] = f'{GCC}/bin/{prefix}-gfortran'
-        env['CC'] = f'{CLANG_BIN}/clang -target {arch.target} {arch_cflags}'
-        env['CXX'] = f'{CLANG_BIN}/clang++ -target {arch.target} {arch_cflags}'
+        env['CC'] = f'{CLANG_BIN}clang -target {arch.target} {arch_cflags}'
+        env['CXX'] = f'{CLANG_BIN}clang++ -target {arch.target} {arch_cflags}'
 
         # scipy expects ldshared to be a single executable without options
         env['LDSHARED'] = f'{CLANG_BIN}/clang'
@@ -66,7 +66,7 @@ def get_recipe_env(self, arch):
         env['CPPFLAGS'] = '-DANDROID'
 
         # configure linker
-        env['LDFLAGS'] += f' {LDSHARED_opts} -L{libgfortran} -L{numpylib}/core/lib -L{numpylib}/random/lib'
+        env['LDFLAGS'] = f' {LDSHARED_opts} -L{libgfortran} -L{numpylib}/core/lib -L{numpylib}/random/lib'
         env['LDFLAGS'] += f' -l{self.stl_lib_name}'
         return env