diff options
Diffstat (limited to '0001-Fix-clang-build.patch')
| -rw-r--r-- | 0001-Fix-clang-build.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch deleted file mode 100644 index aa83bd5b0052..000000000000 --- a/0001-Fix-clang-build.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/qtbase/mkspecs/android-clang/qmake.conf 2019-04-09 06:51:26.000000000 -0300 -+++ b/qtbase/mkspecs/android-clang/qmake.conf 2019-06-10 15:27:30.837639900 -0300 -@@ -15,26 +15,22 @@ - QMAKE_CXX = $$NDK_LLVM_PATH/bin/clang++ - - equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ -- QMAKE_CFLAGS += -target armv7-none-linux-androideabi -+ QMAKE_CFLAGS += -target armv7-linux-androideabi$$replace(ANDROID_PLATFORM, "android-", "") - else: equals(ANDROID_TARGET_ARCH, armeabi): \ -- QMAKE_CFLAGS += -target armv5te-none-linux-androideabi -+ QMAKE_CFLAGS += -target armv5te-linux-androideabi$$replace(ANDROID_PLATFORM, "android-", "") - else: equals(ANDROID_TARGET_ARCH, arm64-v8a): \ -- QMAKE_CFLAGS += -target aarch64-none-linux-android -+ QMAKE_CFLAGS += -target aarch64-linux-android$$replace(ANDROID_PLATFORM, "android-", "") - else: equals(ANDROID_TARGET_ARCH, x86): \ -- QMAKE_CFLAGS += -target i686-none-linux-android -mstackrealign -+ QMAKE_CFLAGS += -target i686-linux-android$$replace(ANDROID_PLATFORM, "android-", "") -mstackrealign - else: equals(ANDROID_TARGET_ARCH, x86_64): \ -- QMAKE_CFLAGS += -target x86_64-none-linux-android -+ QMAKE_CFLAGS += -target x86_64-linux-android$$replace(ANDROID_PLATFORM, "android-", "") - - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a - equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - --QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ -- -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \ -- -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include \ -- -isystem $$NDK_ROOT/sources/android/support/include \ -- -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include -+QMAKE_CFLAGS += -DANDROID_HAS_WSTRING - - ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH - -@@ -50,3 +46,6 @@ - QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz - - include(../common/android-base-tail.conf) -+ -+QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] -+QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config - ---- a/qtbase/mkspecs/common/android-base-tail.conf 2019-04-09 06:51:26.000000000 -0300 -+++ b/qtbase/mkspecs/common/android-base-tail.conf 2019-06-10 15:45:27.869082761 -0300 -@@ -68,7 +68,7 @@ - QMAKE_LIBDIR_OPENGL = - - QMAKE_LINK_SHLIB = $$QMAKE_LINK --QMAKE_LFLAGS = --sysroot=$$ANDROID_PLATFORM_ROOT_PATH -+QMAKE_LFLAGS = - equals(ANDROID_TARGET_ARCH, x86_64) QMAKE_LFLAGS += -L$$ANDROID_PLATFORM_ROOT_PATH/usr/lib64 - QMAKE_LFLAGS_APP = -Wl,--no-undefined -Wl,-z,noexecstack -shared - QMAKE_LFLAGS_SHLIB = -Wl,--no-undefined -Wl,-z,noexecstack -shared |