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) | |
download | meta-qt5-e4e2acba9fe7e6c5903770b26ae374b74051d91c.tar.gz |
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" | |||
277 | 277 | ||
278 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 278 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
279 | 279 | ||
280 | TARGET_MKSPEC ?= "linux-g++" | ||
281 | |||
282 | # use clean mkspecs on target | ||
283 | pkg_postinst_${PN}-tools () { | ||
284 | sed -i \ | ||
285 | -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ | ||
286 | -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ | ||
287 | $D${OE_QMAKE_PATH_BINS}/qt.conf | ||
288 | } | ||
289 | |||
290 | pkg_postinst_${PN}-mkspecs () { | ||
291 | sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri | ||
292 | sed -i \ | ||
293 | -e 's: cross_compile : :g' \ | ||
294 | -e 's:HOST_QT_TOOLS =.*::g' \ | ||
295 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | ||
296 | } | ||
297 | |||
280 | SRCREV = "411c2e3e4f32ab98bab65bcd53faf11da3c4efd0" | 298 | SRCREV = "411c2e3e4f32ab98bab65bcd53faf11da3c4efd0" |