Skip to content

Commit 75a445a

Browse files
committed
Cleanup + fix some broken recipes
1 parent 4d7c5ab commit 75a445a

File tree

6 files changed

+2
-36
lines changed

6 files changed

+2
-36
lines changed

ci/constants.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ class TargetPython(Enum):
3232
'zope_interface',
3333
# Requires zope_interface, which is broken.
3434
'twisted',
35-
# Mirko: FIXME
36-
'icu',
35+
# genericndkbuild is incompatible with sdl2 (which is build by default when targeting sdl2 bootstrap)
3736
'genericndkbuild',
38-
'evdev'
3937
])
4038

4139
BROKEN_RECIPES = {

pythonforandroid/recipes/evdev/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class EvdevRecipe(CompiledComponentsPythonRecipe):
55
name = 'evdev'
66
version = 'v0.4.7'
77
url = 'https://github.com/gvalkov/python-evdev/archive/{version}.zip'
8+
call_hostpython_via_targetpython = False
89

910
depends = []
1011

pythonforandroid/recipes/icu/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class ICURecipe(Recipe):
2929
'libicutu{}.so'.format(major_version): 'build_icu_android/lib',
3030
'libiculx{}.so'.format(major_version): 'build_icu_android/lib',
3131
}
32-
need_stl_shared = True
3332

3433
@property
3534
def versioned_url(self):
@@ -94,7 +93,6 @@ def make_build_dest(dest):
9493
_env=host_env)
9594
shprint(sh.make, "-j", str(cpu_count()), _env=host_env)
9695
shprint(sh.make, "install", _env=host_env)
97-
9896
build_android, exists = make_build_dest("build_icu_android")
9997
if not exists:
10098
configure = sh.Command(join(build_root, "source", "configure"))

pythonforandroid/recipes/libffi/__init__.py

-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ class LibffiRecipe(Recipe):
2121

2222
built_libraries = {'libffi.so': '.libs'}
2323

24-
"""
25-
def get_recipe_env(self, arch=None):
26-
env = super().get_recipe_env(arch)
27-
env['STRIP'] = ''
28-
return env
29-
"""
30-
3124
def build_arch(self, arch):
3225
env = self.get_recipe_env(arch)
3326
with current_directory(self.get_build_dir(arch.arch)):

pythonforandroid/recipes/libiconv/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ class LibIconvRecipe(Recipe):
1313

1414
built_libraries = {'libiconv.so': 'lib/.libs'}
1515

16-
# patches = ['libiconv-1.15-no-gets.patch']
17-
1816
def build_arch(self, arch):
1917
env = self.get_recipe_env(arch)
2018
with current_directory(self.get_build_dir(arch.arch)):

pythonforandroid/recipes/libiconv/libiconv-1.15-no-gets.patch

-22
This file was deleted.

0 commit comments

Comments
 (0)