From 1e899756695efb11b827caa791faef7abd2a5617 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 29 Jan 2025 11:25:42 +0100 Subject: [PATCH] wpewebkit: avoid pulling in qtbase-native dependency if not necessary By default, we don't enable wpewebkit's qtwpe config, so the qtbase-native dependency pulled in automatically via the qt6-cmake bbclass isn't necessary. Make sure the dependency only gets pulled in when needed. Signed-off-by: Gabriel Valcazar --- .../recipes-browser/wpewebkit/wpewebkit_%.bbappend | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend index 127e9d236..a76a89b39 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2020-2024, Digi International Inc. +# Copyright (C) 2020-2025, Digi International Inc. # We can't build the WebKit with fb images, so force wayland as a required # distro feature. @@ -23,3 +23,10 @@ PACKAGECONFIG:remove = " \ # on the i.MX6 and ccmp1 PACKAGECONFIG:remove:ccimx6 = "gbm" PACKAGECONFIG:remove:ccmp1 = "gbm" + +# If BBLAYERS contains meta-qt6, the wpewebkit recipe inherits the qt6-cmake +# bbclass, which is necessary if the qtwpe PACKAGECONFIG is enabled. However, +# even if this config is disabled, the bbclass automatically adds a dependency +# with qtbase-native. Only keep this dependency if we enable qtwpe, and remove +# it otherwise. +DEPENDS:remove = "${@bb.utils.contains('PACKAGECONFIG', 'qtwpe', '', 'qtbase-native', d)}"