From a095a553c677ea4ab9f4898a9904750d466c6777 Mon Sep 17 00:00:00 2001 From: Andre Miras Date: Sun, 29 Sep 2019 14:15:32 +0200 Subject: [PATCH] Fixes libiconv & libzbar configure host Having `--host=x86` was making the configure script fail at enabling shared library build on `x86`. This was resulting in failing to copy `libiconv.so` and `libzbar.so` on `x86` arch. --- pythonforandroid/recipes/libiconv/__init__.py | 2 +- pythonforandroid/recipes/libzbar/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonforandroid/recipes/libiconv/__init__.py b/pythonforandroid/recipes/libiconv/__init__.py index 6bde196e56..530497a2ed 100644 --- a/pythonforandroid/recipes/libiconv/__init__.py +++ b/pythonforandroid/recipes/libiconv/__init__.py @@ -20,7 +20,7 @@ def build_arch(self, arch): with current_directory(self.get_build_dir(arch.arch)): shprint( sh.Command('./configure'), - '--host=' + arch.toolchain_prefix, + '--host=' + arch.command_prefix, '--prefix=' + self.ctx.get_python_install_dir(), _env=env) shprint(sh.make, '-j' + str(cpu_count()), _env=env) diff --git a/pythonforandroid/recipes/libzbar/__init__.py b/pythonforandroid/recipes/libzbar/__init__.py index 8d7d48e2b7..5b1b62d8c1 100644 --- a/pythonforandroid/recipes/libzbar/__init__.py +++ b/pythonforandroid/recipes/libzbar/__init__.py @@ -32,7 +32,7 @@ def build_arch(self, arch): shprint(sh.Command('autoreconf'), '-vif', _env=env) shprint( sh.Command('./configure'), - '--host=' + arch.toolchain_prefix, + '--host=' + arch.command_prefix, '--target=' + arch.toolchain_prefix, '--prefix=' + self.ctx.get_python_install_dir(), # Python bindings are compiled in a separated recipe