From 7f5b84fd74c60cc00b11e2f870a40d8066d0dcfe Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 25 Jul 2025 08:20:26 -0700 Subject: [PATCH] qtwebengine: Disable building on musl targets Chromium needs lot of patches to build with musl e.g. see meta-browser [1] for patches Until there is interest to port qtwebengine to musl mark it incompatible [1] https://github.com/OSSystems/meta-browser/tree/master/meta-chromium/recipes-browser/chromium/files/musl Change-Id: Icb862000b957f89bf793b2cda4fada23c38bfe01 Reviewed-by: Samuli Piippo (cherry picked from commit 8827bfefbcacd28d9855a2ec4f8f4673a8c2559b) --- recipes-qt/packagegroups/packagegroup-qt6-addons.bb | 2 ++ recipes-qt/packagegroups/packagegroup-qt6-examples.bb | 2 ++ recipes-qt/qt6/chromium-gn.inc | 1 + recipes-qt/qt6/qtdoc-examples_git.bb | 1 + recipes-qt/qt6/qtpdf-examples_git.bb | 1 + recipes-qt/qt6/qtwebengine-examples_git.bb | 1 + recipes-qt/qt6/qtwebview-examples_git.bb | 1 + recipes-qt/qt6/qtwebview_git.bb | 1 + 8 files changed, 10 insertions(+) diff --git a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb index 48f251e..9c39ac6 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb @@ -73,3 +73,5 @@ RDEPENDS:${PN}:append:x86-64 = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \ " + +RDEPENDS:${PN}:remove:libc-musl = "qtpdf qtwebengine qtwebview" diff --git a/recipes-qt/packagegroups/packagegroup-qt6-examples.bb b/recipes-qt/packagegroups/packagegroup-qt6-examples.bb index 58719f3..e4a92e1 100644 --- a/recipes-qt/packagegroups/packagegroup-qt6-examples.bb +++ b/recipes-qt/packagegroups/packagegroup-qt6-examples.bb @@ -72,6 +72,8 @@ RDEPENDS:${PN}:append:x86-64 = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \ " +RDEPENDS:${PN}:remove:libc-musl = "qtpdf-examples qtwebengine-examples qtwebview-examples" + COMMERCIAL_EXAMPLES = " \ qtinsighttracker-examples \ qtvncserver-examples \ diff --git a/recipes-qt/qt6/chromium-gn.inc b/recipes-qt/qt6/chromium-gn.inc index b2eac7f..ea48dc6 100644 --- a/recipes-qt/qt6/chromium-gn.inc +++ b/recipes-qt/qt6/chromium-gn.inc @@ -4,6 +4,7 @@ inherit linuxloader inherit qemu COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE:libc-musl = "(-)" COMPATIBLE_MACHINE:aarch64 = "(.*)" COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" diff --git a/recipes-qt/qt6/qtdoc-examples_git.bb b/recipes-qt/qt6/qtdoc-examples_git.bb index b38fef8..f95cd57 100644 --- a/recipes-qt/qt6/qtdoc-examples_git.bb +++ b/recipes-qt/qt6/qtdoc-examples_git.bb @@ -40,3 +40,4 @@ DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtp DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}" DEPENDS:append:x86 = " qtquick3dphysics" DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics" +DEPENDS:remove:libc-musl = "qtpdf" diff --git a/recipes-qt/qt6/qtpdf-examples_git.bb b/recipes-qt/qt6/qtpdf-examples_git.bb index 1680f04..ce0a18f 100644 --- a/recipes-qt/qt6/qtpdf-examples_git.bb +++ b/recipes-qt/qt6/qtpdf-examples_git.bb @@ -10,6 +10,7 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE:libc-musl = "(-)" COMPATIBLE_MACHINE:aarch64 = "(.*)" COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" diff --git a/recipes-qt/qt6/qtwebengine-examples_git.bb b/recipes-qt/qt6/qtwebengine-examples_git.bb index 93996fa..5849955 100644 --- a/recipes-qt/qt6/qtwebengine-examples_git.bb +++ b/recipes-qt/qt6/qtwebengine-examples_git.bb @@ -14,6 +14,7 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE:libc-musl = "(-)" COMPATIBLE_MACHINE:aarch64 = "(.*)" COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" diff --git a/recipes-qt/qt6/qtwebview-examples_git.bb b/recipes-qt/qt6/qtwebview-examples_git.bb index c68d339..19fd090 100644 --- a/recipes-qt/qt6/qtwebview-examples_git.bb +++ b/recipes-qt/qt6/qtwebview-examples_git.bb @@ -10,6 +10,7 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "opengl" COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE:libc-musl = "(-)" COMPATIBLE_MACHINE:aarch64 = "(.*)" COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" diff --git a/recipes-qt/qt6/qtwebview_git.bb b/recipes-qt/qt6/qtwebview_git.bb index b2dd115..ddf133d 100644 --- a/recipes-qt/qt6/qtwebview_git.bb +++ b/recipes-qt/qt6/qtwebview_git.bb @@ -16,6 +16,7 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine" COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE:libc-musl = "(-)" COMPATIBLE_MACHINE:aarch64 = "(.*)" COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)"