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

qtbase: fix install if lcl_maybe_fortify is empty

Browse Source 
lcl_maybe_fortify might be empty, which would make sed fail during
do_install. Workaround this by adding space to the substitution
pattern.

Fixes: QTBUG-115588
Change-Id: Ic6c5a6c80011dfefc92e1b2d7aadc48cce82ed7a
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit deab0703da)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Samuli Piippo 2023-08-25 09:23:41 +00:00 committed by Qt Cherry-pick Bot
parent 75ce91384a
commit 05e78180cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-qt/qt6/qtbase_git.bb
View File

@ -206,7 +206,7 @@ EOF
do_install:append:class-target() {
sed >> ${D}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf <<EOF \
-e 's:${lcl_maybe_fortify}::' \
-e 's: ${lcl_maybe_fortify}: :' \
-e 's:${DEBUG_PREFIX_MAP}::' \
-e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
-e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:'