mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
ef20add4c9
Qt 5.15.3 release is a patch release made on the top of Qt 5.15.2. As a patch release, Qt 5.15.3 does not add any new functionality but provides bug fixes and other improvements. https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.3/release-note.md * dropped patches: - patches/qt/dont_use_avx_android_x86_64.patch - patches/qt/fix_bigsur_style.patch * adjusted patches: - patches/qt/fix_android_jni_static.patch - patches/qt/fix_limits_header.patch - patches/qt/use_android_ndk23.patch Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
14 lines
577 B
Diff
14 lines
577 B
Diff
Use Android NDK r23 LTS
|
|
|
|
--- old/qtbase/mkspecs/features/android/default_pre.prf
|
|
+++ new/qtbase/mkspecs/features/android/default_pre.prf
|
|
@@ -76,7 +76,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
|
|
else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android-
|
|
else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi-
|
|
|
|
-QMAKE_RANLIB = $${CROSS_COMPILE}ranlib
|
|
+QMAKE_RANLIB = $$NDK_LLVM_PATH/bin/llvm-ranlib
|
|
QMAKE_LINK_SHLIB = $$QMAKE_LINK
|
|
QMAKE_LFLAGS =
|
|
|