From 5549cccb51117da568a45d8a1c1fed3caba2286d Mon Sep 17 00:00:00 2001 From: Andre Miras Date: Sun, 11 Aug 2024 23:18:31 +0200 Subject: [PATCH] TODO debugging, squash --- pythonforandroid/bootstrap.py | 2 +- pythonforandroid/recipes/libxml2/__init__.py | 2 +- pythonforandroid/recipes/protobuf_cpp/__init__.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py index 0f226b6e54..8bbbcf0eb6 100755 --- a/pythonforandroid/bootstrap.py +++ b/pythonforandroid/bootstrap.py @@ -377,7 +377,7 @@ def strip_libraries(self, arch): libs_dir = join(self.dist_dir, f'_python_bundle__{arch.arch}', '_python_bundle', 'modules') filens = shprint(sh.find, libs_dir, join(self.dist_dir, 'libs'), - '-iname', '*.so', _env=env) + '-iname', '*.so', _env=env).stdout.decode('utf-8') logger.info('Stripping libraries in private dir') for filen in filens.split('\n'): diff --git a/pythonforandroid/recipes/libxml2/__init__.py b/pythonforandroid/recipes/libxml2/__init__.py index 21cc09dba1..100c528dc3 100644 --- a/pythonforandroid/recipes/libxml2/__init__.py +++ b/pythonforandroid/recipes/libxml2/__init__.py @@ -20,7 +20,7 @@ def build_arch(self, arch): shprint(sh.Command('./autogen.sh'), _env=env) shprint(sh.Command('autoreconf'), '-vif', _env=env) build_arch = shprint( - sh.gcc, '-dumpmachine').split('\n')[0] + sh.gcc, '-dumpmachine').stdout.decode('utf-8').split('\n')[0] shprint(sh.Command('./configure'), '--build=' + build_arch, '--host=' + arch.command_prefix, diff --git a/pythonforandroid/recipes/protobuf_cpp/__init__.py b/pythonforandroid/recipes/protobuf_cpp/__init__.py index 96ae0e517b..7209e0909b 100644 --- a/pythonforandroid/recipes/protobuf_cpp/__init__.py +++ b/pythonforandroid/recipes/protobuf_cpp/__init__.py @@ -76,6 +76,7 @@ def build_arch(self, arch): with current_directory(self.get_build_dir(arch.arch)): build_arch = ( shprint(sh.gcc, '-dumpmachine') + .stdout.decode('utf-8') .split('\n')[0] )