CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qmake: fix path to external host bins

Browse Source 
The OE_QMAKE_PATH_EXTERNAL_HOST_BINS is used for native host tools,
such as qmake, and it was working only for target builds. Calculate
correct path for native and nativesdk builds as well, taking into
account case where additional subdirectory is added to QT6_INSTALL_BINDIR.

Fixes: QTBUG-140631
Pick-to: 6.9 6.8
Change-Id: Ic8f36a64a6a43b0a073586a90ecf832482727dad
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 769d4acc80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2025-09-29 07:30:15 +00:00 committed by Qt Cherry-pick Bot
parent fb8737c59a
commit 1308750f48
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/qt6-qmake.bbclass
View File

@ -18,7 +18,7 @@ OE_QMAKE_PATH_HOST_BINS = "${QT6_INSTALL_BINDIR}"
OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"
OE_QMAKE_PATH_HOST_LIBEXECS = "${QT6_INSTALL_LIBEXECDIR}"
OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_BINS}"
OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_BINDIR_NATIVE'),os.path.relpath(d.getVar('OE_QMAKE_PATH_HOST_BINS'),d.getVar('bindir'))))}"
# This is useful for target recipes to reference native mkspecs
QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"