Fix numpy for ndk r19

Author: opacam

pythonforandroid/recipes/numpy/__init__.py

@@ -8,14 +8,12 @@ class NumpyRecipe(CompiledComponentsPythonRecipe):
     version = '1.15.1'
     url = 'https://pypi.python.org/packages/source/n/numpy/numpy-{version}.zip'
     site_packages_name = 'numpy'
-    depends = [('python2', 'python3', 'python3crystax')]
+    depends = [('python2', 'python3', 'python3crystax'), 'setuptools']
+    call_hostpython_via_targetpython = False
 
     patches = [
         join('patches', 'fix-numpy.patch'),
-        join('patches', 'prevent_libs_check.patch'),
-        join('patches', 'ar.patch'),
         join('patches', 'lib.patch'),
-        join('patches', 'python-fixes.patch')
     ]
 
     def build_compiled_components(self, arch):
@@ -28,31 +26,5 @@ def rebuild_compiled_components(self, arch, env):
         super(NumpyRecipe, self).rebuild_compiled_components(arch, env)
         self.setup_extra_args = []
 
-    def get_recipe_env(self, arch):
-        env = super(NumpyRecipe, self).get_recipe_env(arch)
-
-        flags = " -L{} --sysroot={}".format(
-            join(self.ctx.ndk_platform, 'usr', 'lib'),
-            self.ctx.ndk_platform
-        )
-
-        py_ver = self.ctx.python_recipe.major_minor_version_string
-        py_inc_dir = self.ctx.python_recipe.include_root(arch.arch)
-        py_lib_dir = self.ctx.python_recipe.link_root(arch.arch)
-        if self.ctx.ndk == 'crystax':
-            src_dir = join(self.ctx.ndk_dir, 'sources')
-            flags += " -I{}".format(join(src_dir, 'crystax', 'include'))
-            flags += " -L{}".format(join(src_dir, 'crystax', 'libs', arch.arch))
-        flags += ' -I{}'.format(py_inc_dir)
-        flags += ' -L{} -lpython{}'.format(py_lib_dir, py_ver)
-        if 'python3' in self.ctx.python_recipe.name:
-            flags += 'm'
-
-        if flags not in env['CC']:
-            env['CC'] += flags
-        if flags not in env['LD']:
-            env['LD'] += flags + ' -shared'
-        return env
-
 
 recipe = NumpyRecipe()