diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-02-22 13:11:56 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-07 23:51:33 +0000 |
commit | 77ed8fb225093148583d4d119b89c26d4acc4ee5 (patch) | |
tree | b13a4f10bd78cfbd71d912d01598ff6a937e59fe | |
parent | 75c7d00e109512c133167255e5a9e86fda43f07f (diff) | |
download | meta-qt5-77ed8fb225093148583d4d119b89c26d4acc4ee5.tar.gz |
qtbase: Adjust target mkspec settings
* linux-oe-g++ won't work use linux-g++ by default
* we doe not cross compile on target
* adjustment are done at postinst to keep build sysroots unmodified
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index adf0a43c..ca31626b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -272,4 +272,19 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
272 | 272 | ||
273 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 273 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
274 | 274 | ||
275 | TARGET_MKSPEC ?= "linux-g++" | ||
276 | |||
277 | # use clean mkspecs on target | ||
278 | pkg_postinst_${PN}-tools () { | ||
279 | sed -i \ | ||
280 | -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ | ||
281 | -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ | ||
282 | $D${bindir}/qt.conf | ||
283 | sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri | ||
284 | sed -i \ | ||
285 | -e 's: cross_compile : :g' \ | ||
286 | -e 's:HOST_QT_TOOLS =.*::g' \ | ||
287 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | ||
288 | } | ||
289 | |||
275 | SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" | 290 | SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" |