Skip to content

Commit 5f40570

Browse files
committed
Cleanup + icu now seems that is not needing stl_shared anymore
1 parent 75a445a commit 5f40570

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pythonforandroid/recipes/libzbar/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def build_arch(self, arch):
3333
shprint(
3434
sh.Command('./configure'),
3535
'--host=' + arch.command_prefix,
36-
# '--target=' + arch.toolchain_prefix,
36+
'--target=' + arch.command_prefix,
3737
'--prefix=' + self.ctx.get_python_install_dir(arch.arch),
3838
# Python bindings are compiled in a separated recipe
3939
'--with-python=no',

tests/test_recipe.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def test_get_stl_lib_dir(self):
256256
returns the expected path for the stl library
257257
"""
258258
arch = ArchAarch_64(self.ctx)
259-
recipe = Recipe.get_recipe('icu', self.ctx)
259+
recipe = Recipe.get_recipe('libgeos', self.ctx)
260260
self.assertTrue(recipe.need_stl_shared)
261261
self.assertEqual(
262262
recipe.get_stl_lib_dir(arch),
@@ -288,7 +288,7 @@ def test_get_recipe_env_with(
288288
mock_find_executable.return_value = expected_compiler
289289

290290
arch = ArchAarch_64(self.ctx)
291-
recipe = Recipe.get_recipe('icu', self.ctx)
291+
recipe = Recipe.get_recipe('libgeos', self.ctx)
292292
assert recipe.need_stl_shared, True
293293
env = recipe.get_recipe_env(arch)
294294
# check that the mocks have been called
@@ -333,7 +333,7 @@ def test_install_stl_lib(
333333
mock_isfile.return_value = False
334334

335335
arch = ArchAarch_64(self.ctx)
336-
recipe = Recipe.get_recipe('icu', self.ctx)
336+
recipe = Recipe.get_recipe('libgeos', self.ctx)
337337
recipe.ctx = self.ctx
338338
assert recipe.need_stl_shared, True
339339
recipe.install_stl_lib(arch)
@@ -351,7 +351,7 @@ def test_install_stl_lib(
351351
@mock.patch('pythonforandroid.recipe.Recipe.install_stl_lib')
352352
def test_postarch_build(self, mock_install_stl_lib):
353353
arch = ArchAarch_64(self.ctx)
354-
recipe = Recipe.get_recipe('icu', self.ctx)
354+
recipe = Recipe.get_recipe('libgeos', self.ctx)
355355
assert recipe.need_stl_shared, True
356356
recipe.postbuild_arch(arch)
357357
mock_install_stl_lib.assert_called_once_with(arch)

0 commit comments

Comments
 (0)