qt5: move do_install modifications to shared qt5.inc and reuse do_configure
This commit is contained in:
parent
0a88f92505
commit
7d3f0711ee
|
@ -81,6 +81,19 @@ do_compile() {
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
oe_runmake install INSTALL_ROOT=${D}
|
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
|
||||||
|
if [ -d ${D}${STAGING_DIR_TARGET} ] ; then
|
||||||
|
cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
|
||||||
|
rm -rf ${D}${STAGING_DIR_TARGET}
|
||||||
|
# remove empty dirs
|
||||||
|
TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
|
||||||
|
while test ${TMP} != ${D}; do
|
||||||
|
rmdir ${TMP}
|
||||||
|
TMP=`dirname ${TMP}`;
|
||||||
|
done
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
|
PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
|
||||||
|
|
|
@ -105,17 +105,6 @@ do_install_append() {
|
||||||
# qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
|
# qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
|
||||||
# ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
|
# ERROR: objcopy failed with exit code 1 (cmd was 'arm-oe-linux-gnueabi-objcopy' --only-keep-debug '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/qmake' '/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.1-r0.0/package/usr/bin/.debug/qmake')
|
||||||
rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
|
rm -f ${D}/${bindir}/${QT_DIR_NAME}/qmake
|
||||||
|
|
||||||
# everything except HostData and HostBinaries is prefixed with sysroot value,
|
|
||||||
# but we cannot remove sysroot override, because that's useful for pkg-config etc
|
|
||||||
cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
|
|
||||||
rm -rf ${D}${STAGING_DIR_TARGET}
|
|
||||||
# remove empty dirs
|
|
||||||
TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
|
|
||||||
while test ${TMP} != ${D}; do
|
|
||||||
rmdir ${TMP}
|
|
||||||
TMP=`dirname ${TMP}`;
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES =. "${PN}-fonts "
|
PACKAGES =. "${PN}-fonts "
|
||||||
|
|
|
@ -6,27 +6,10 @@ INC_PR = "r0"
|
||||||
|
|
||||||
inherit qmake5
|
inherit qmake5
|
||||||
|
|
||||||
do_configure () {
|
do_configure_append () {
|
||||||
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
|
|
||||||
unset LD
|
|
||||||
|
|
||||||
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
|
||||||
cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
|
|
||||||
rm -rf ${D}${STAGING_DIR_TARGET}
|
|
||||||
# remove empty dirs
|
|
||||||
TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
|
|
||||||
while test ${TMP} != ${D}; do
|
|
||||||
rmdir ${TMP}
|
|
||||||
TMP=`dirname ${TMP}`;
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
FILES_${PN}-qmlplugins-dbg = " \
|
FILES_${PN}-qmlplugins-dbg = " \
|
||||||
${libdir}/${QT_DIR_NAME}/qml/*/.debug \
|
${libdir}/${QT_DIR_NAME}/qml/*/.debug \
|
||||||
${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \
|
${libdir}/${QT_DIR_NAME}/qml/*/*/.debug \
|
||||||
|
|
|
@ -17,22 +17,6 @@ SRC_URI += " \
|
||||||
file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
|
file://0002-v8.pro-respect-external-host-bindir-when-set.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
do_configure () {
|
do_configure_append () {
|
||||||
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
|
|
||||||
unset LD
|
|
||||||
|
|
||||||
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append () {
|
|
||||||
# everything except HostData and HostBinaries is prefixed with sysroot value,
|
|
||||||
# but we cannot remove sysroot override, because that's useful for pkg-config etc
|
|
||||||
cp -ra ${D}${STAGING_DIR_TARGET}/* ${D}
|
|
||||||
rm -rf ${D}${STAGING_DIR_TARGET}
|
|
||||||
# remove empty dirs
|
|
||||||
TMP=`dirname ${D}/${STAGING_DIR_TARGET}`
|
|
||||||
while test ${TMP} != ${D}; do
|
|
||||||
rmdir ${TMP}
|
|
||||||
TMP=`dirname ${TMP}`;
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue