From b6b180a74ff622855d17957dafd95630e13f36da Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 12 May 2022 20:24:44 +0200 Subject: [PATCH] Fix bogus env path for qt6 toolchain setup Use '$ENV{PATH}' otherwise generated file: sysroots/x86_64-pokysdk-linux/usr/share/cmake/Qt6Toolchain.cmake ends with: set(ENV{PATH} "${SYSROOTS}/x86_64-pokysdk-linux/usr/bin:ENV{PATH}") which breaks find_package calls. Pick-to: 6.3 6.2 Change-Id: Ieed45ca785ffdc0700f620863c5672e9764d3f8e Reviewed-by: Alexandru Croitor Reviewed-by: Samuli Piippo --- classes/populate_sdk_qt6_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index 985493e..575898e 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -79,7 +79,7 @@ include_guard(GLOBAL) get_filename_component(SYSROOTS \${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE) -set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}ENV{PATH}") +set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}\$ENV{PATH}") set(ENV{PKG_CONFIG_SYSROOT_DIR} "${SDKTARGETSYSROOT}") set(ENV{PKG_CONFIG_PATH} "${SDKTARGETSYSROOT}${libdir}/pkgconfig")