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 /recipes-qt/qt5/qtbase_git.bb | |
| parent | 3c86e3c28f00129fd408f9ad8daddd034bb19161 (diff) | |
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -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" 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${bindir}/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 = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" |