Remove libffi's method get_host

opacam · opacam · commit 7ff372cc1193 · 2019-01-25T10:24:21.000+01:00
To simplify the linkage of the libffi library (with this we will know exactly where will be built libffi files before the build happens)
diff --git a/pythonforandroid/python.py b/pythonforandroid/python.py
@@ -179,8 +179,8 @@ def add_flags(include_flags, link_dirs, link_libs):
             info('Activating flags for libffi')
             recipe = Recipe.get_recipe('libffi', self.ctx)
             add_flags(' -I' + ' -I'.join(recipe.get_include_dirs(arch)),
-                      ' -L' + join(recipe.get_build_dir(arch.arch),
-                                   recipe.get_host(arch), '.libs'), ' -lffi')
+                      ' -L' + join(recipe.get_build_dir(arch.arch), '.libs'),
+                      ' -lffi')
 
         if 'openssl' in self.ctx.recipe_build_order:
             info('Activating flags for openssl')
diff --git a/pythonforandroid/recipes/libffi/__init__.py b/pythonforandroid/recipes/libffi/__init__.py
@@ -19,21 +19,6 @@ class LibffiRecipe(Recipe):
 
     patches = ['remove-version-info.patch']
 
-    def get_host(self, arch):
-        with current_directory(self.get_build_dir(arch.arch)):
-            host = None
-            with open('Makefile') as f:
-                for line in f:
-                    if line.startswith('host = '):
-                        host = line.strip()[7:]
-                        break
-
-            if not host or not exists(host):
-                raise RuntimeError('failed to find build output! ({})'
-                                   .format(host))
-
-            return host
-
     def should_build(self, arch):
         return not exists(join(self.ctx.get_libs_dir(arch.arch), 'libffi.so'))
 
@@ -46,6 +31,7 @@ def build_arch(self, arch):
             shprint(sh.Command('./configure'),
                     '--host=' + arch.command_prefix,
                     '--prefix=' + self.ctx.get_python_install_dir(),
+                    '--disable-builddir',
                     '--enable-shared', _env=env)
             # '--with-sysroot={}'.format(self.ctx.ndk_platform),
             # '--target={}'.format(arch.toolchain_prefix),
@@ -62,7 +48,7 @@ def build_arch(self, arch):
                 info("make libffi.la failed as expected")
             cc = sh.Command(env['CC'].split()[0])
             cflags = env['CC'].split()[1:]
-            host_build = join(self.get_build_dir(arch.arch), self.get_host(arch))
+            host_build = self.get_build_dir(arch.arch)
 
             arch_flags = ''
             if '-march=' in env['CFLAGS']:
@@ -91,8 +77,7 @@ def build_arch(self, arch):
                     join(host_build, '.libs', 'libffi.so'))
 
     def get_include_dirs(self, arch):
-        return [join(self.get_build_dir(arch.arch), self.get_host(arch),
-                     'include')]
+        return [join(self.get_build_dir(arch.arch), 'include')]
 
 
 recipe = LibffiRecipe()
