nativesdk-qtbase: do qmake replacement in ${D} instead of ${B}
* This way we don't mangle ${B} and can repeat do_install if necessary. And previously it would require running do_compile again to restore the proper state of ${B}. * Need to bump PR, since do_compile isn't changing, but needs to re-run to re-populate qmake-real binary. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
parent
4375b28f7c
commit
5599656cda
|
@ -10,6 +10,8 @@ require nativesdk-qt5.inc
|
||||||
# it's already included with newer oe-core, but include it here for dylan
|
# it's already included with newer oe-core, but include it here for dylan
|
||||||
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
|
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
|
||||||
|
|
||||||
|
PR = "r1"
|
||||||
|
|
||||||
# common with -native and target version
|
# common with -native and target version
|
||||||
SRC_URI += "\
|
SRC_URI += "\
|
||||||
file://0001-Add-linux-oe-g-platform.patch \
|
file://0001-Add-linux-oe-g-platform.patch \
|
||||||
|
@ -192,14 +194,12 @@ do_install() {
|
||||||
# Fix install paths for all
|
# Fix install paths for all
|
||||||
find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
|
find -name "Makefile*" | xargs sed -i "s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
|
||||||
|
|
||||||
# switch back the proper qmake
|
|
||||||
if [ -e ${B}/bin/qmake-real ]; then
|
|
||||||
rm ${B}/bin/qmake
|
|
||||||
mv ${B}/bin/qmake-real ${B}/bin/qmake
|
|
||||||
fi
|
|
||||||
|
|
||||||
oe_runmake install INSTALL_ROOT=${D}
|
oe_runmake install INSTALL_ROOT=${D}
|
||||||
|
|
||||||
|
# replace the native qmake installed above with nativesdk version
|
||||||
|
rm -rf ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
|
||||||
|
install -m 755 ${B}/bin/qmake-real ${D}${OE_QMAKE_PATH_HOST_BINS}/qmake
|
||||||
|
|
||||||
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
|
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
|
||||||
# e.g. qt3d, qtwayland
|
# e.g. qt3d, qtwayland
|
||||||
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
|
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
|
||||||
|
|
Loading…
Reference in New Issue