From f55ee894d0982fd75db90df22219451aa9144a09 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 12 Mar 2021 13:29:51 +0200 Subject: [PATCH] sdk: copy qt.conf to libexec dir Some of the tools have been moved to libexec dir and need to have the qt.conf available there as well. Amend also commit 381dcb985d9a5e305d0eff6e3bf476dedbbb0057 so that qt.conf in the SDK contains the path for the host libexecdir. Task-number: QTBUG-91756 Pick-to: 6.1 Change-Id: Id76b603d1107dd70c63be7682007e4c34621750a Reviewed-by: Mikko Gronoff --- classes/populate_sdk_qt6_base.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass index 2e6a3fa..dcf470d 100644 --- a/classes/populate_sdk_qt6_base.bbclass +++ b/classes/populate_sdk_qt6_base.bbclass @@ -29,11 +29,15 @@ create_qt6_sdk_files () { echo 'HostData = ${SDKTARGETSYSROOT}${QT6_INSTALL_ARCHDATADIR}' >> $qtconf echo 'HostBinaries = ${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}' >> $qtconf echo 'HostLibraries = ${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}' >> $qtconf + echo 'HostLibraryExecutables = ${SDKPATHNATIVE}${QT6_INSTALL_LIBEXECDIR}' >> $qtconf echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf echo 'HostSpec = linux-oe-g++' >> $qtconf echo 'TargetSpec = linux-oe-g++' >> $qtconf echo 'SysrootifyPrefix = true' >> $qtconf + # make copy to libexec dir + cp $qtconf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_LIBEXECDIR}/ + install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh touch $script