From: Denys Dmytriyenko <[email protected]> Latest qtwebkit 5.15 fails to build for armv5 with bunch of errors like:
Error: selected processor does not support `movw r8,#:lower16:.Lllint_op_enter-.LrelativePCBase' in ARM mode Since omapl138/armv5 is already underpowered and has no graphics, it doesn't make too much sense to run matrix gui in qtwebkit while software rendering everything offscreen. Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-core/packagegroups/packagegroup-arago-qte.bb | 5 ++++- .../packagegroups/packagegroup-arago-tisdk-matrix.bb | 1 + meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb | 1 + .../packagegroup-arago-qte-toolchain-target.bb | 9 +++++++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb index 6dac7bfb..129838cc 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb @@ -6,6 +6,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +WEBKIT = "qtwebkit-qmlplugins" +WEBKIT:armv5 = "" + RDEPENDS:${PN} = "\ qtbase-plugins \ qtdeclarative-qmlplugins \ @@ -20,7 +23,7 @@ RDEPENDS:${PN} = "\ qtgraphicaleffects-qmlplugins \ qtvirtualkeyboard-plugins \ qtvirtualkeyboard-qmlplugins \ - qtwebkit-qmlplugins \ + ${WEBKIT} \ liberation-fonts \ qtconnectivity \ qtconnectivity-qmlplugins \ diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb index d4a4712c..63afc4ec 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb @@ -17,6 +17,7 @@ MATRIX_GUI = " \ refresh-screen \ matrix-gui-browser \ " +MATRIX_GUI:omapl138 = "" MATRIX_COMMON_APPS = " \ matrix-gui-armbenchmarks-demos \ diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb index b22f1151..9299a929 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb @@ -59,6 +59,7 @@ do_install(){ } GUIDEPS = "${@bb.utils.contains('DISTRO_FEATURES','opengl',"matrix-gui-browser refresh-screen",'',d)}" +GUIDEPS:omapl138 = "" RDEPENDS:${PN} += "matrix-lighttpd-config lighttpd lighttpd-module-cgi lighttpd-module-deflate lighttpd-module-expire php php-cgi php-cli ${GUIDEPS}" diff --git a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb index e0fb9a1d..0380f3a6 100644 --- a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb +++ b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb @@ -7,6 +7,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup +WEBKIT = " \ + qtwebkit-mkspecs \ + qtwebkit-dev \ +" +WEBKIT:armv5 = "" + RDEPENDS:${PN} += " \ packagegroup-arago-standalone-sdk-target \ libsqlite3-dev \ @@ -27,8 +33,7 @@ RDEPENDS:${PN} += " \ qtsensors-dev \ qtsvg-dev \ qtxmlpatterns-dev \ - qtwebkit-mkspecs \ - qtwebkit-dev \ + ${WEBKIT} \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "qtwebengine-mkspecs qtwebengine-dev", "", d)} \ qtserialport-mkspecs \ qtserialport-dev \ -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14227): https://lists.yoctoproject.org/g/meta-arago/message/14227 Mute This Topic: https://lists.yoctoproject.org/mt/97221750/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/leave/10763299/21656/89520264/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
