From 259ef133362d46f9571526c680d9a072a102863e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 16 Oct 2024 09:26:23 +0000 Subject: [PATCH] Remove TMPDIR references from qmake files Qmake files still have references to build time paths that cannot be mapped to any real runtime path. Task-number: QTBUG-105913 Pick-to: 6.8 Change-Id: I047a21204e2154cbf36c8417ae0e2e63be45564f Reviewed-by: Ari Parkkila --- classes/qt6-cmake.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass index 9671704..0479a62 100644 --- a/classes/qt6-cmake.bbclass +++ b/classes/qt6-cmake.bbclass @@ -39,10 +39,12 @@ EXTRA_OECMAKE += "\ do_install:append() { # Replace host paths with qmake built-in properties QTBUG-84725 + # remove all references to TMPDIR that could not be replaced QTBUG-105877 find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \ sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \ -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ - -e '/QMAKE_PRL_BUILD_DIR/d' {} \; + -e '/QMAKE_PRL_BUILD_DIR/d' \ + -e '\|${WORKDIR}|d' {} \; } export QT_DISABLE_SHADER_DISK_CACHE = "1"