aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2022-04-27 15:08:02 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2022-05-02 07:56:11 +0000
commitbede93a8b206ac1bb35bf57896f2f05e91f3ed2d (patch)
treed1fc6953f9f288af0826379b30cbca820f2fb0ff /recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
parent4c5016183e83c683ec39f2d882d5f68d34c0f44e (diff)
parent5b71df60e523423b9df6793de9387f87a149ac42 (diff)
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
* New QtPdf recipe adjusted to use same revision as lts-5.15 branch qtwebengine * New python3-ptest-qt recipe excluded * QtWebengine from upstream is newer than stated v5.15.8, almost 5.15.9 version, hence directly synced patches from upstream. Still needed 0012-chromium-Add-missing-include-for-C-strncpy.patch to build * Unneeded recipe specific QT_MODULE_BRANCH adjustments & module version alteration patches removed changelog: 5b71df60 qt5-creator: add pkgconfig to inherit 851a0ad5 maliit-framework-qt5, maliit-plugins-qt5: Disable tests for gcc too 98086b54 ogl-runtime: Check for ppc64 before ppc 4837db1d qtwebengine: Add libxkbfile only when x11 is in distro features 74c27fa5 qt5: upgrade to v5.15.3-lts-lgpl 32e6203c qtwebkit: Fix build when x11 is not in distro features 121c1bfd qtpdf: Fix build with clang on aarch64 06647dd2 qtpdf: Fix build with clang 6f82e21d qtwebengine: Add missing libxkbfile dependency 347fcfb1 qtwebengine: fix build with newer icu+libxml cc3d1c0c meta: update license names 5d4b73ad python3-pytest-qt: add 4.0.2 5fc0c4dc layers: Bump to use kirkstone d38470c2 qtwebengine: upgrade to v5.15.8 and use the same SRCREVs as qtpdf 642c0e2e qtpdf: fix BSD license like in qtwebengine a1232fbe qtpdf: remove duplicated patches 73326c90 qtpdf: add as dedicated recipe f23d41fe recipes-qt: update ambiguous "BSD" license with "BSD-3-Clause" ce5b4c9a qtbase: Fix ptest compilation with clang b34ac6ed qt5: set ALLOW_EMPTY for mkspecs subpackage Change-Id: Iafdfc96fa010231ece0b0b5dd286f7cd440aaa8d
Diffstat (limited to 'recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
new file mode 100644
index 00000000..a3605718
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
@@ -0,0 +1,41 @@
+From f339005f6ee97911bd0c2ed9d9445f5aac514155 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 6 Dec 2018 15:06:20 -0800
+Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
+
+This is required when using clang for compiler, fixes
+mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mkspecs/features/toolchain.prf | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
+index 11ecd6b2a5..a9a65c6800 100644
+--- a/mkspecs/features/toolchain.prf
++++ b/mkspecs/features/toolchain.prf
+@@ -41,6 +41,13 @@ defineReplace(qtVariablesFromGCC) {
+ return($$ret)
+ }
+
++defineReplace(qtVariablesFromCLANG) {
++ ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \
++ <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec)
++ !equals(ec, 0): qtCompilerErrror($$1, $$ret)
++ return($$ret)
++}
++
+ isEmpty($${target_prefix}.COMPILER_MACROS) {
+ msvc {
+ clang_cl {
+@@ -60,6 +67,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
+ } else {
+ vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
+ }
++ } else: clang {
++ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS)
+ } else: gcc|ghs {
+ vars = $$qtVariablesFromGCC($$QMAKE_CXX)
+ }