aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2022-03-07 13:44:09 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2022-03-10 09:27:33 +0100
commit74c27fa59b329f1210d39e8cd2904acf30d10838 (patch)
tree7db3edd064427d207e72c1ade90fae579e97684b /recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
parent32e6203c8c31ace8eb31e2e8c6de72d5de8cc531 (diff)
qt5: upgrade to v5.15.3-lts-lgpl
* https://github.com/meta-qt5/meta-qt5/issues/455 * https://lists.qt-project.org/pipermail/development/2022-March/042262.html qtbase/0021-qfloat16-Include-limits-header.patch partially resolved in upstream commit: 0afad46bb7 Fix build with GCC 11: include <limits> qtbase/0022-fix_timezone_dst.patch resolved in upstream commits: 692c7e021f Fix QTzTimeZonePrivate::displayName()'s fallback 5f91ed1493 QTzTimeZonePrivate::init(): fix handling of empty ID 9f74724d84 Fix handling of Sunday in POSIX time-zone rules qtsvg/CVE-2021-3481.patch: partially resolved in upstream commit: aceea78 Improve handling of malformed numeric values in svg files but the 2nd part is still needed. qtcoap, qtknx, qtmqtt, qtopcua: keep QT_MODULE_BRANCH "5.15.2" as it still wasn't downmerged to 5.15 branch and there is no v5.15.3-lts-lgpl tag in these as well Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
deleted file mode 100644
index 2333b4a1..00000000
--- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a83f643bfea108dda725a7b0c7eb8c957004466f 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 03612e5689..f227e0772e 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)
- }