zepto-forks/meta-mortsgna
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qtbase / sysroots: Fix qt.conf / adjust mkspecs

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-12-07 13:32:24 +01:00
parent 7b6f297ad0
commit 30da1979e6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
appends/meta-qt5/qtbase_%.bbappend
View File

@@ -14,18 +14,23 @@ do_copy_to_cross_sysroot_append() {
generate_qt_config_file_effective_paths
# copy to cross sysroot
cross_sysroot_qtconf="${INSTANT_CROSS_PATH}${OE_QMAKE_PATH_QT_BINS}/`basename ${OE_QMAKE_QTCONF_PATH}`"
cp -f ${OE_QMAKE_QTCONF_PATH} "$cross_sysroot_qtconf"
echo "$cross_sysroot_qtconf" >> ${INSTANT_MANIFEST}
qtconf=`basename ${OE_QMAKE_QTCONF_PATH}`
targetpath=${INSTANT_CROSS_PATH}${OE_QMAKE_PATH_HOST_BINS}
cp -f "${OE_QMAKE_QTCONF_PATH}" "$targetpath"
echo "${OE_QMAKE_PATH_HOST_BINS}/$qtconf" >> ${INSTANT_MANIFEST}
# adjust to instant sysroot
qtconf_cross_sysroot=
sed -i \
-e 's:${STAGING_DIR_NATIVE}:${INSTANT_NATIVE_PATH}:g' \
-e 's:${STAGING_DIR_HOST}:${INSTANT_CROSS_PATH}:g' \
"$cross_sysroot_qtconf"
"$targetpath/$qtconf"
# ---------- mkspecs ----------
# qmake.conf replace -fdebug-prefix-map ( see bitbake.conf )
# ---------- mkspecs qmake.conf ----------
rm ${INSTANT_CROSS_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf
cp -f "${WORKDIR}/packages-split/${PN}-mkspecs${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf" \
"${INSTANT_CROSS_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/"
sed -i \
-e 's:${DEBUG_PREFIX_MAP}:-fdebug-prefix-map=${INSTANT_CROSS_PATH}= -fdebug-prefix-map=${INSTANT_NATIVE_PATH}=:g' \
"${INSTANT_CROSS_PATH}${libdir}${QT_DIR_NAME}/mkspecs/${XPLATFORM}/qmake.conf"
}