summarylogtreecommitdiffstats
path: root/0001-Fix-clang-build.patch
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2018-12-12 00:16:39 -0300
committerGonzalo Exequiel Pedone2018-12-12 00:16:39 -0300
commite5aeb4b37bebf95455e5f208b7d53f73c40b1c23 (patch)
tree32d65e4e7790b77ed60b8ee661c78bdf3afb08b2 /0001-Fix-clang-build.patch
parent98ec136ececfe706bca293a7a33ad29cf7b54e5b (diff)
downloadaur-e5aeb4b37bebf95455e5f208b7d53f73c40b1c23.tar.gz
Updated to Qt 5.12.0.
Diffstat (limited to '0001-Fix-clang-build.patch')
-rw-r--r--0001-Fix-clang-build.patch24
1 files changed, 13 insertions, 11 deletions
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
index 431f20e727e..4dcb9e2d9c8 100644
--- a/0001-Fix-clang-build.patch
+++ b/0001-Fix-clang-build.patch
@@ -1,7 +1,7 @@
---- 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 @@
-
+--- a/qtbase/mkspecs/android-clang/qmake.conf 2018-12-03 08:15:26.000000000 -0300
++++ b/qtbase/mkspecs/android-clang/qmake.conf 2018-12-11 14:07:47.497103671 -0300
+@@ -31,18 +31,19 @@
+
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 \
@@ -12,12 +12,14 @@
- -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
-
+
+ exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \
+- ANDROID_CXX_STL_LIBS = -lc++
++ ANDROID_CXX_STL_LIBS = -lc++_shared
+ else: \
+ ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "")
+