qtbase: temporary disable target qmake build and add PN-mkspecs
This commit is contained in:
parent
def240608a
commit
812c33e0c6
|
@ -84,23 +84,27 @@ do_configure_append() {
|
||||||
|
|
||||||
do_compile_append() {
|
do_compile_append() {
|
||||||
# Build qmake for the target arch
|
# Build qmake for the target arch
|
||||||
cd ${S}/qmake
|
# Disable for now, because doesn't work well with separate ${B}
|
||||||
${OE_QMAKE_QMAKE}
|
# cd ${S}/qmake
|
||||||
oe_runmake CC="${CC}" CXX="${CXX}"
|
# ${OE_QMAKE_QMAKE}
|
||||||
cd ${S}
|
# oe_runmake CC="${CC}" CXX="${CXX}"
|
||||||
|
# cd ${S}
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install_append() {
|
do_install_append() {
|
||||||
### Fix up the binaries to the right location
|
### Fix up the binaries to the right location
|
||||||
### TODO: FIX
|
### TODO: FIX
|
||||||
install -d ${D}${bindir}/
|
# qemu built on host breaks do_package, remove it here (will be replaces with right qemu when do_compile is fixed
|
||||||
mv ${D}/${STAGING_BINDIR_NATIVE}/* ${D}${bindir}/
|
# 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 -rf ${D}/${STAGING_BINDIR_NATIVE}/
|
rm -f ${D}/${bindir}/qmake
|
||||||
|
mv ${D}${B}/mkspecs ${D}${libdir}/${QT_DIR_NAME}/mkspecs
|
||||||
# Install the right arch qmake
|
TMP=`dirname ${D}/${B}/mkspecs`
|
||||||
rm ${D}/${bindir}/qmake
|
while test ${TMP} != ${D}; do
|
||||||
install -m 0755 bin/qmake2 ${D}${bindir}/qmake
|
rmdir ${TMP}
|
||||||
|
TMP=`dirname ${TMP}`;
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES =. "${PN}-fonts "
|
PACKAGES =. "${PN}-fonts ${PN}-mkspecs "
|
||||||
FILES_${PN}-fonts = "${libdir}/fonts"
|
FILES_${PN}-fonts = "${libdir}/fonts"
|
||||||
|
FILES_${PN}-mkspecs = "${libdir}/${QT_DIR_NAME}/mkspecs"
|
||||||
|
|
Loading…
Reference in New Issue