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

Remove obsolete install fix for qmake builds

Browse Source 
With recipe-sysroot now used, the concurrent installation
cannot occur and the install fix is not needed.
This commit is contained in:
Samuli Piippo 2020-05-19 09:48:58 +03:00
parent e56547ecb5
commit 15d42fc22c
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
classes/qt6-qmake.bbclass
View File

@ -242,21 +242,6 @@ do_install_class-native() {
fi
}
qmake5_base_fix_install() {
STAGING_PATH=$1
if [ -d ${D}${STAGING_PATH} ] ; then
echo "Some files are installed in wrong directory ${D}${STAGING_PATH}"
cp -ra ${D}${STAGING_PATH}/* ${D}
rm -rf ${D}${STAGING_PATH}
# remove empty dirs
TMP=`dirname ${D}${STAGING_PATH}`
while test ${TMP} != ${D}; do
rmdir ${TMP}
TMP=`dirname ${TMP}`;
done
fi
}
do_install() {
# Fix install paths for all
find . -name "Makefile*" | xargs -r sed -i "s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
@ -265,14 +250,6 @@ do_install() {
oe_runmake install INSTALL_ROOT=${D}
# everything except HostData and HostBinaries is prefixed with sysroot value,
# but we cannot remove sysroot override, because that's useful for pkg-config etc
# concurrent builds may cause qmake to regenerate Makefiles and override the above
# sed changes. If that happens, move files manually to correct location.
qmake5_base_fix_install ${STAGING_DIR_TARGET}
qmake5_base_fix_install ${STAGING_DIR_HOST}
qmake5_base_fix_install ${STAGING_DIR_NATIVE}
# Replace host paths with qmake built-in properties
find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \
sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \