TODO debugging, squash

kivy · Aug 11, 2024 · 5549ccc · 5549ccc
1 parent 73d5659
commit 5549ccc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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]
             )