diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | |
parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) | |
download | meta-qt5-ce766374432309b85fdcfe8ef287dbb2ef11b337.tar.gz |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch new file mode 100644 index 00000000..324cf1e5 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From 3be18ebcfc3fa18755bad83664b3cff7482e0fea Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 | ||
4 | Subject: [PATCH] Add OE specific specs for clang compiler | ||
5 | |||
6 | Signed-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 | |||
14 | diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf | ||
15 | new file mode 100644 | ||
16 | index 0000000..ffc9f05 | ||
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) | ||
63 | diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h | ||
64 | new file mode 100644 | ||
65 | index 0000000..880c927 | ||
66 | --- /dev/null | ||
67 | +++ b/mkspecs/linux-oe-clang/qplatformdefs.h | ||
68 | @@ -0,0 +1 @@ | ||
69 | +#include "../linux-clang/qplatformdefs.h" | ||