From af73962f3da2812baa8c4f19964635cf669df03d Mon Sep 17 00:00:00 2001 From: Jeroen Hofstee Date: Mon, 27 Dec 2021 16:11:22 +0100 Subject: [PATCH] qt6-qmake: use the OE_QMAKE bindir and libexecdir The bindir and libexecdir can be set to a different directory. Since qmake and tools were searched for in the normal native staging bindir and libexec dir, they would not be found. So use the OE_QMAKE version of them instead. Change-Id: I834bded248a79a6f0d18c6a32b4230f44ddf6a64 Pick-to: 6.2 6.3 Reviewed-by: Samuli Piippo --- classes/qt6-qmake.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/qt6-qmake.bbclass b/classes/qt6-qmake.bbclass index 02463d1..5c3f06d 100644 --- a/classes/qt6-qmake.bbclass +++ b/classes/qt6-qmake.bbclass @@ -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_BINDIR_NATIVE}" +OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_BINS}" # This is useful for target recipes to reference native mkspecs QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}" @@ -149,7 +149,7 @@ HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} HostLibraries = ${STAGING_LIBDIR_NATIVE} HostData = ${OE_QMAKE_PATH_HOST_DATA} HostPrefix = ${STAGING_DIR_NATIVE} -HostLibraryExecutables = ${STAGING_LIBEXECDIR_NATIVE} +HostLibraryExecutables = ${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_LIBEXECS} EOF } #