diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-08 16:46:58 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-09 10:44:41 +0200 |
| commit | e4e2acba9fe7e6c5903770b26ae374b74051d91c (patch) | |
| tree | 505cd3e6f7f77b048bdf6c968e95c344a4838fff | |
| parent | e8ea238957ec233e360d6ffe3f9f318c58bd943c (diff) | |
qtbase: Adjust target mkspec settings
Bing back commit 77ed8fb2 which was previously reverted.
Change-Id: Iab5fbad3d799679a901601f502e637e982b8bcea
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 94620736..4211c59b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -277,4 +277,22 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" +TARGET_MKSPEC ?= "linux-g++" + +# use clean mkspecs on target +pkg_postinst_${PN}-tools () { +sed -i \ + -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ + -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ + $D${OE_QMAKE_PATH_BINS}/qt.conf +} + +pkg_postinst_${PN}-mkspecs () { +sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri +sed -i \ + -e 's: cross_compile : :g' \ + -e 's:HOST_QT_TOOLS =.*::g' \ + $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri +} + SRCREV = "411c2e3e4f32ab98bab65bcd53faf11da3c4efd0" |