From 44302cdb01865c43fc1ed7069d825d40e89910d9 Mon Sep 17 00:00:00 2001
From: Konrad Weihmann <konrad.weihmann@avnet.eu>
Date: Fri, 2 Jun 2023 05:29:37 +0000
Subject: [PATCH] inc-files: append to DEPENDS only
so it won't overwrite already set DEPENDS settings from the recipe,
if the inc file is included after the DEPENDS statement.
E.g.
foo_1.0.bb:
DEPENDS = "foo"
include foo.inc
would silently remove "foo" from the computed DEPENDS chain.
Append or += makes sure that it won't matter where the include is
placed in the recipe itself.
Signed-off-by: Konrad Weihmann <konrad.weihmann@avnet.eu>
---
recipes-browser/cog/cog.inc | 2 +-
recipes-browser/libwpe/libwpe.inc | 2 +-
recipes-browser/wpebackend-fdo/wpebackend-fdo.inc | 2 +-
recipes-browser/wpebackend-rdk/wpebackend-rdk.inc | 2 +-
recipes-browser/wpebackend/wpebackend.inc | 2 +-
recipes-browser/wpewebkit/wpewebkit.inc | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/recipes-browser/cog/cog.inc b/recipes-browser/cog/cog.inc
index 9c963cde..6e03fd77 100644
--- a/recipes-browser/cog/cog.inc
+++ b/recipes-browser/cog/cog.inc
@@ -14,7 +14,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI = "https://wpewebkit.org/releases/${P}.tar.xz"
# Depend on wpewebkit unless the webkitgtk packageconfig option is selected.
-DEPENDS = " \
+DEPENDS += "\
${@bb.utils.contains('PACKAGECONFIG', 'webkitgtk', 'webkitgtk', 'wpewebkit', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'fdo', 'wayland', '', d)} \
${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'dunfell gatesgarth hardknott honister', 'libsoup-2.4', 'libsoup', d)} \
diff --git a/recipes-browser/libwpe/libwpe.inc b/recipes-browser/libwpe/libwpe.inc
index 462a3466..116877a3 100644
--- a/recipes-browser/libwpe/libwpe.inc
+++ b/recipes-browser/libwpe/libwpe.inc
@@ -6,7 +6,7 @@ SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc"
-DEPENDS = "virtual/egl"
+DEPENDS:append = " virtual/egl"
PROVIDES += "virtual/libwpe"
RPROVIDES:${PN} += "virtual/libwpe"
diff --git a/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc b/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc
index 2b1c3faa..89d2878b 100644
--- a/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc
+++ b/recipes-browser/wpebackend-fdo/wpebackend-fdo.inc
@@ -6,7 +6,7 @@ SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66"
-DEPENDS = "glib-2.0 libxkbcommon wayland libepoxy libwpe"
+DEPENDS += "glib-2.0 libxkbcommon wayland libepoxy libwpe"
DEPENDS:append:class-target = " wayland-native"
PROVIDES += "virtual/wpebackend"
RPROVIDES:${PN} += "virtual/wpebackend"
diff --git a/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc b/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc
index 70282f71..78b2b324 100644
--- a/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc
+++ b/recipes-browser/wpebackend-rdk/wpebackend-rdk.inc
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/WebPlatformForEmbedded/WPEBackend-rdk.git;protocol=g
PROVIDES += "virtual/wpebackend"
RPROVIDES:${PN} += "virtual/wpebackend"
-DEPENDS = "libwpe virtual/egl glib-2.0 libxkbcommon xkeyboard-config libinput libudev"
+DEPENDS:append = " libwpe virtual/egl glib-2.0 libxkbcommon xkeyboard-config libinput libudev"
inherit cmake pkgconfig
diff --git a/recipes-browser/wpebackend/wpebackend.inc b/recipes-browser/wpebackend/wpebackend.inc
index 6c859a3a..d99a25d3 100644
--- a/recipes-browser/wpebackend/wpebackend.inc
+++ b/recipes-browser/wpebackend/wpebackend.inc
@@ -4,7 +4,7 @@ BUGTRACKER = "https://github.com/WebPlatformForEmbedded/WPEBackend/issues"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=6ae4db0d4b812334e1539cd5aa6e2f46"
-DEPENDS = "virtual/egl libxkbcommon"
+DEPENDS:append = " virtual/egl libxkbcommon"
PROVIDES += "virtual/libwpe"
RPROVIDES:${PN} += "virtual/libwpe"
diff --git a/recipes-browser/wpewebkit/wpewebkit.inc b/recipes-browser/wpewebkit/wpewebkit.inc
index 84b49c46..f492bb2f 100644
--- a/recipes-browser/wpewebkit/wpewebkit.inc
+++ b/recipes-browser/wpewebkit/wpewebkit.inc
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.webkit.org/"
LICENSE = "BSD-2-Clause & ${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'dunfell gatesgarth hardknott honister', 'LGPL-2.0', 'LGPL-2.0-or-later', d)}"
LIC_FILES_CHKSUM = "file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 "
-DEPENDS = " \
+DEPENDS:append = " \
${@bb.utils.contains_any('LAYERSERIES_CORENAMES', 'dunfell gatesgarth hardknott honister', 'libsoup-2.4', 'libsoup', d)} \
bison-native gperf-native harfbuzz-native libxml2-native ccache-native ninja-native ruby-native cairo \
fontconfig freetype glib-2.0 harfbuzz icu jpeg pcre sqlite3 zlib libpng \