diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-02 09:18:31 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 08:00:01 +0000 |
| commit | f087aeb1e988fcb0597fcf2b27981b1803909276 (patch) | |
| tree | 4b4bb1ec98f8a6357dc64f4ea090d8b715caa0bc | |
| parent | 3c86e3c28f00129fd408f9ad8daddd034bb19161 (diff) | |
| download | meta-qt5-f087aeb1e988fcb0597fcf2b27981b1803909276.tar.gz | |
Revert "qtbase: Adjust target mkspec settings"
This reverts commits 77ed8fb225093148583d4d119b89c26d4acc4ee5 &
47d1132b1dc2521299f5041dbb61c8afc29461fd "qtbase: fix target mkspec adjustment"
These changes cause QTBUG-75513.
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Task-number: QTBUG-75513
Change-Id: I917bda1b7f6eb70c137070ae0ca0a66e160de523
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e080f115..0c24690a 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
| @@ -266,22 +266,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
| 266 | 266 | ||
| 267 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 267 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
| 268 | 268 | ||
| 269 | TARGET_MKSPEC ?= "linux-g++" | ||
| 270 | |||
| 271 | # use clean mkspecs on target | ||
| 272 | pkg_postinst_${PN}-tools () { | ||
| 273 | sed -i \ | ||
| 274 | -e 's:HostSpec =.*:HostSpec = ${TARGET_MKSPEC}:g' \ | ||
| 275 | -e 's:TargetSpec =.*:TargetSpec = ${TARGET_MKSPEC}:g' \ | ||
| 276 | $D${bindir}/qt.conf | ||
| 277 | } | ||
| 278 | |||
| 279 | pkg_postinst_${PN}-mkspecs () { | ||
| 280 | sed -i 's: cross_compile : :g' $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qconfig.pri | ||
| 281 | sed -i \ | ||
| 282 | -e 's: cross_compile : :g' \ | ||
| 283 | -e 's:HOST_QT_TOOLS =.*::g' \ | ||
| 284 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | ||
| 285 | } | ||
| 286 | |||
| 287 | SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" | 269 | SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" |
