summarylogtreecommitdiffstats
path: root/0001-Fix-clang-build.patch
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2018-09-24 10:36:28 -0300
committerGonzalo Exequiel Pedone2018-09-24 10:36:28 -0300
commit83cce1aac9147dcead14b3c88aff1fb11f610f3f (patch)
tree46f4d0ae25965be0d17c1668b95dfcfb576e8a86 /0001-Fix-clang-build.patch
parent213ec5b716a7d0fda778f69686974948bdfc88c7 (diff)
downloadaur-83cce1aac9147dcead14b3c88aff1fb11f610f3f.tar.gz
Updated to Qt 5.11.2.
Diffstat (limited to '0001-Fix-clang-build.patch')
-rw-r--r--0001-Fix-clang-build.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
new file mode 100644
index 000000000000..431f20e727e1
--- /dev/null
+++ b/0001-Fix-clang-build.patch
@@ -0,0 +1,23 @@
+--- a/qtbase/mkspecs/android-clang/qmake.conf 2018-09-13 01:25:10.000000000 -0300
++++ b/qtbase/mkspecs/android-clang/qmake.conf 2018-09-23 15:53:19.000000000 -0300
+@@ -31,16 +31,17 @@
+
+ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH
+ QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a
+-QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \
++QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \
+ -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
++ -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include \
++ -isystem $$NDK_ROOT/sysroot/usr/include
+
+ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
+
+ ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so
+-ANDROID_CXX_STL_LIBS = -lc++
++ANDROID_CXX_STL_LIBS = -lc++_shared
+
+ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
+