Skip to content

Commit bc292d4

Browse files
committed
Fully set up Python3 patches to work with both 3.7.1 and 3.8.1
1 parent 61fcf11 commit bc292d4

File tree

6 files changed

+7
-5
lines changed

6 files changed

+7
-5
lines changed

pythonforandroid/recipes/python3/__init__.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@ class Python3Recipe(GuestPythonRecipe):
2525

2626
patches = [
2727
# Python 3.7.1
28-
('patches/fix-ctypes-util-find-library.patch', version_starts_with("3.7")),
29-
('patches/fix-zlib-version.patch', version_starts_with("3.7"))
28+
('patches/py3.7.1_fix-ctypes-util-find-library.patch', version_starts_with("3.7")),
29+
('patches/py3.7.1_fix-zlib-version.patch', version_starts_with("3.7"))
3030

3131
# Python 3.8.1
32-
('patches/py381.patch', version_starts_with("3.8"))
32+
('patches/py3.8.1.patch', version_starts_with("3.8"))
3333
]
3434

3535
if sh.which('lld') is not None:
36-
raise RuntimeError("!!!")
37-
patches = patches + ["patches/remove-fix-cortex-a8.patch"]
36+
patches = patches + [
37+
("patches/py3.7.1_remove-fix-cortex-a8.patch", version_starts_with("3.7")),
38+
("patches/py3.8.1_remove-fix-cortex-a8.patch", version_starts_with("3.8"))
39+
]
3840

3941
depends = ['hostpython3', 'sqlite3', 'openssl', 'libffi']
4042
conflicts = ['python2']

0 commit comments

Comments
 (0)