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

Use bindir for tools on Windows SDK

Browse Source 
Move all the builttime tools back to bindir when building a Windows
SDK. This saves us from adding mingw libraries to the libexec dir
needed by the tools.

Fixes: QTBUG-91895
Pick-to: 6.1
Change-Id: I4da0f03190e3862e93c49fbd267baf567bf7a5d5
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
This commit is contained in:
Samuli Piippo 2021-03-18 13:45:47 +02:00
parent 0a096d1814
commit 212ae9b201
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/populate_sdk_qt6_base.bbclass
View File

@ -6,9 +6,12 @@ SDK_POSTPROCESS_COMMAND_prepend = "create_qt6_sdk_files;"
PATH_DELIM = ":" PATH_DELIM = ":"
PATH_DELIM_sdkmingw32 = ";" PATH_DELIM_sdkmingw32 = ";"
QT6_INSTALL_HOST_LIBEXECDIR = "${QT6_INSTALL_LIBEXECDIR}"
QT6_INSTALL_HOST_LIBEXECDIR_sdkmingw32 = "${QT6_INSTALL_LIBEXECDIR_mingw32}"
create_qt6_sdk_files () { create_qt6_sdk_files () {
# Generate a qt.conf file to be deployed with the SDK # Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/qt.conf qtconf=${WORKDIR}/qt.conf
touch $qtconf touch $qtconf
echo '[Paths]' >> $qtconf echo '[Paths]' >> $qtconf
echo 'Prefix = ${prefix}' >> $qtconf echo 'Prefix = ${prefix}' >> $qtconf
@ -29,14 +32,15 @@ create_qt6_sdk_files () {
echo 'HostData = ${SDKTARGETSYSROOT}${QT6_INSTALL_ARCHDATADIR}' >> $qtconf echo 'HostData = ${SDKTARGETSYSROOT}${QT6_INSTALL_ARCHDATADIR}' >> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}' >> $qtconf echo 'HostBinaries = ${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}' >> $qtconf
echo 'HostLibraries = ${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}' >> $qtconf echo 'HostLibraries = ${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}' >> $qtconf
echo 'HostLibraryExecutables = ${SDKPATHNATIVE}${QT6_INSTALL_LIBEXECDIR}' >> $qtconf echo 'HostLibraryExecutables = ${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}' >> $qtconf
echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
echo 'HostSpec = linux-oe-g++' >> $qtconf echo 'HostSpec = linux-oe-g++' >> $qtconf
echo 'TargetSpec = linux-oe-g++' >> $qtconf echo 'TargetSpec = linux-oe-g++' >> $qtconf
echo 'SysrootifyPrefix = true' >> $qtconf echo 'SysrootifyPrefix = true' >> $qtconf
# make copy to libexec dir # add qt.conf to both bin and libexec dirs
cp $qtconf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_LIBEXECDIR}/ cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/
cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}/
install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d
script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh

3
classes/qt6-paths.bbclass
View File

@ -10,8 +10,9 @@ QT6_INSTALL_LIBDIR ?= "${libdir}"
QT6_INSTALL_ARCHDATADIR ?= "${libdir}" QT6_INSTALL_ARCHDATADIR ?= "${libdir}"
# Plugins [ARCHDATADIR/plugins] # Plugins [ARCHDATADIR/plugins]
QT6_INSTALL_PLUGINSDIR ?= "${libdir}/plugins" QT6_INSTALL_PLUGINSDIR ?= "${libdir}/plugins"
# Helper programs ARCHDATADIR/libexec otherwise # Helper programs [ARCHDATADIR/bin on Windows, ARCHDATADIR/libexec otherwise]
QT6_INSTALL_LIBEXECDIR ?= "${libexecdir}" QT6_INSTALL_LIBEXECDIR ?= "${libexecdir}"
QT6_INSTALL_LIBEXECDIR_mingw32 ?= "${bindir}"
# QML2 imports [ARCHDATADIR/qml] # QML2 imports [ARCHDATADIR/qml]
QT6_INSTALL_QMLDIR ?= "${libdir}/qml" QT6_INSTALL_QMLDIR ?= "${libdir}/qml"
# "Arch-independent data [PREFIX] # "Arch-independent data [PREFIX]