Skip to content

Commit d9d6cdd

Browse files
committed
add patch to fix build for x86_64
1 parent 609af88 commit d9d6cdd

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

pythonforandroid/recipes/qt5/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class Qt5Recipe(BootstrapNDKRecipe):
2020

2121
depends = ['python3']
2222
conflicts = ['sdl2', 'genericndkbuild']
23+
patches = ["disable-x86_64-avx-avx2.patch"]
2324

2425
need_stl_shared = True
2526

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff --git a/qtbase/configure.json b/qtbase/configure.json
2+
index c273aee..4a7c50f 100644
3+
--- a/qtbase/configure.json
4+
+++ b/qtbase/configure.json
5+
@@ -1098,7 +1098,7 @@
6+
},
7+
"avx": {
8+
"label": "AVX",
9+
- "condition": "features.sse4_2 && tests.avx",
10+
+ "condition": "features.sse4_2 && tests.avx && (!config.android || !arch.x86_64)",
11+
"output": [
12+
"privateConfig",
13+
{ "type": "define", "name": "QT_COMPILER_SUPPORTS_AVX", "value": 1 }
14+
@@ -1114,7 +1114,7 @@
15+
},
16+
"avx2": {
17+
"label": "AVX2",
18+
- "condition": "features.avx && tests.avx2",
19+
+ "condition": "features.avx && tests.avx2 && (!config.android || !arch.x86_64)",
20+
"output": [
21+
"privateConfig",
22+
"privateFeature",

0 commit comments

Comments
 (0)