Skip to content

Commit 6b73f52

Browse files
authored
🐛 Fix Python 3 patch naming and content (#2083)
Because: - the name does not match the file - `py3.8.1_fix_cortex_a8.patch` contains unneeded changes which provokes the patching to fail Also we add a comment to `py3.8.1_fix_cortex_a8.patch` file, explaining why we need that patch (imho, very useful after a while...)
1 parent 4ab6216 commit 6b73f52

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

pythonforandroid/recipes/python3/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Python3Recipe(GuestPythonRecipe):
3535
if sh.which('lld') is not None:
3636
patches = patches + [
3737
("patches/py3.7.1_fix_cortex_a8.patch", version_starts_with("3.7")),
38-
("patches/py3.8.1_fix-cortex-a8.patch", version_starts_with("3.8"))
38+
("patches/py3.8.1_fix_cortex_a8.patch", version_starts_with("3.8"))
3939
]
4040

4141
depends = ['hostpython3', 'sqlite3', 'openssl', 'libffi']

pythonforandroid/recipes/python3/patches/py3.8.1_fix_cortex_a8.patch

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
This patch removes --fix-cortex-a8 from the linker flags in order to support linking
2+
with lld, as lld does not support this flag (https://github.com/android-ndk/ndk/issues/766).
13
diff --git a/configure b/configure
24
index 0914e24..7517168 100755
35
--- a/configure
@@ -11,8 +13,3 @@ index 0914e24..7517168 100755
1113
fi
1214
else
1315
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not Android" >&5
14-
@@ -18673,4 +18673,3 @@ if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
15-
echo "" >&6
16-
echo "" >&6
17-
fi
18-
-

0 commit comments

Comments
 (0)