diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-11-02 11:13:33 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-11-02 11:15:16 +0200 |
commit | ec328d9677f39c223a697bbe1cbf8952631e9817 (patch) | |
tree | 02053800a6baa93715ddffaae4fcfa0b03a3d23e /recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch | |
parent | e0db5666f9c04c92683514ca220b0aafd0a49df2 (diff) | |
parent | d87335a50a9dd35d890786edbd79b8953fdaa11a (diff) |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
* qtyocto/upstream/master:
qt5-ptest.inc: fix qtxmlpatterns:do_install_ptest out-of-order call
meta-qt5: Update to 5.9.2 release
qt5: add missing commercial license
qtxmlpatterns: Add HOMEPAGE info into recipe file.
qttools: Add HOMEPAGE info into recipe file.
qtsvg: Add HOMEPAGE info into recipe file.
qtscript: Add HOMEPAGE info into recipe file.
qtquick1: Add HOMEPAGE info into recipe file.
qtdeclarative: Add HOMEPAGE info into recipe file.
meta: drop a useless file
qtbase-native: Force use of built-in pcre
qtbase-native: set path to mkspec for cmake properly again
qtbase: Fix build with musl/clang
qtbase: Add OE clang specific mkspecs
Conflicts:
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtwebengine_git.bb
Change-Id: I78ce0587cf7468bfdc22156ee8bbd24872f79c6a
Diffstat (limited to 'recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0010-Add-OE-specific-specs-for-clang-compiler.patch | 72 |
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 @@ +From 3a46fb7b47d19c5261e1590f8d70fe41443def64 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 3 Sep 2017 09:11:44 -0700 +Subject: [PATCH] Add OE specific specs for clang compiler + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++++++++++ + mkspecs/linux-oe-clang/qplatformdefs.h | 1 + + 2 files changed, 44 insertions(+) + create mode 100644 mkspecs/linux-oe-clang/qmake.conf + create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h + +diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf +new file mode 100644 +index 0000000000..ffc9f051db +--- /dev/null ++++ b/mkspecs/linux-oe-clang/qmake.conf +@@ -0,0 +1,43 @@ ++# ++# qmake configuration for linux-g++ with modifications for building with OpenEmbedded ++# ++ ++MAKEFILE_GENERATOR = UNIX ++CONFIG += incremental ++QMAKE_INCREMENTAL_STYLE = sublib ++ ++include(../common/linux.conf) ++ ++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip ++QMAKE_AR = $$(OE_QMAKE_AR) cqs ++QMAKE_STRIP = $$(OE_QMAKE_STRIP) ++QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER) ++ ++include(../common/gcc-base-unix.conf) ++ ++# *FLAGS from gcc-base.conf ++QMAKE_CFLAGS += $$(OE_QMAKE_CFLAGS) ++QMAKE_CXXFLAGS += $$(OE_QMAKE_CXXFLAGS) ++QMAKE_LFLAGS += $$(OE_QMAKE_LDFLAGS) ++ ++include(../common/clang.conf) ++ ++# tc settings from g++-base.conf ++QMAKE_COMPILER = $$(OE_QMAKE_COMPILER) clang ++QMAKE_CC = $$(OE_QMAKE_CC) ++QMAKE_CXX = $$(OE_QMAKE_CXX) ++ ++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$(OE_QMAKE_CFLAGS) ++ ++QMAKE_LINK = $$(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) ++QMAKE_LINK_C = $$(OE_QMAKE_LINK) ++QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) ++ ++# for the SDK ++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) ++ ++include(../oe-device-extra.pri) ++ ++load(device_config) ++load(qt_config) +diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h +new file mode 100644 +index 0000000000..880c927b21 +--- /dev/null ++++ b/mkspecs/linux-oe-clang/qplatformdefs.h +@@ -0,0 +1 @@ ++#include "../linux-clang/qplatformdefs.h" +-- +2.14.1 + |