summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-09-03 11:10:34 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-09-05 14:56:02 +0200
commit90d4a41621886ae5e738ec8a0b693e88b25d8267 (patch)
treee130f4c0a0455a302ff96e954217e869271c991f /recipes-qt/qt5/qtbase
parent268429962056a12e0e899612dafb433c257af5cf (diff)
downloadmeta-qt5-90d4a41621886ae5e738ec8a0b693e88b25d8267.tar.gz
qtbase: Add OE clang specific mkspecs
We can not piggy back clang anymore on existing OE mkspecs since starting 5.9 the configure is asking compiler for include paths and it needs to know if platform is clang-linux or g++-linux Fixes: ERROR: failed to parse default search paths from compiler output Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch72
1 files changed, 72 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch
new file mode 100644
index 00000000..b019f67c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch
@@ -0,0 +1,72 @@
1From 3a46fb7b47d19c5261e1590f8d70fe41443def64 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:11:44 -0700
4Subject: [PATCH] Add OE specific specs for clang compiler
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++++++++++
9 mkspecs/linux-oe-clang/qplatformdefs.h | 1 +
10 2 files changed, 44 insertions(+)
11 create mode 100644 mkspecs/linux-oe-clang/qmake.conf
12 create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h
13
14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
15new file mode 100644
16index 0000000000..ffc9f051db
17--- /dev/null
18+++ b/mkspecs/linux-oe-clang/qmake.conf
19@@ -0,0 +1,43 @@
20+#
21+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
22+#
23+
24+MAKEFILE_GENERATOR = UNIX
25+CONFIG += incremental
26+QMAKE_INCREMENTAL_STYLE = sublib
27+
28+include(../common/linux.conf)
29+
30+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
31+QMAKE_AR = $$(OE_QMAKE_AR) cqs
32+QMAKE_STRIP = $$(OE_QMAKE_STRIP)
33+QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER)
34+
35+include(../common/gcc-base-unix.conf)
36+
37+# *FLAGS from gcc-base.conf
38+QMAKE_CFLAGS += $$(OE_QMAKE_CFLAGS)
39+QMAKE_CXXFLAGS += $$(OE_QMAKE_CXXFLAGS)
40+QMAKE_LFLAGS += $$(OE_QMAKE_LDFLAGS)
41+
42+include(../common/clang.conf)
43+
44+# tc settings from g++-base.conf
45+QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) clang
46+QMAKE_CC = $$(OE_QMAKE_CC)
47+QMAKE_CXX = $$(OE_QMAKE_CXX)
48+
49+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(OE_QMAKE_CFLAGS)
50+
51+QMAKE_LINK = $$(OE_QMAKE_LINK)
52+QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK)
53+QMAKE_LINK_C = $$(OE_QMAKE_LINK)
54+QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
55+
56+# for the SDK
57+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
58+
59+include(../oe-device-extra.pri)
60+
61+load(device_config)
62+load(qt_config)
63diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
64new file mode 100644
65index 0000000000..880c927b21
66--- /dev/null
67+++ b/mkspecs/linux-oe-clang/qplatformdefs.h
68@@ -0,0 +1 @@
69+#include "../linux-clang/qplatformdefs.h"
70--
712.14.1
72