Skip to content

Commit

Permalink
inc-files: append to DEPENDS only
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
kwavnet authored and clopez committed Jun 6, 2023
1 parent b2156c2 commit 44302cd
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion recipes-browser/cog/cog.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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)} \
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/libwpe/libwpe.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpebackend-fdo/wpebackend-fdo.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpebackend-rdk/wpebackend-rdk.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpebackend/wpebackend.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion recipes-browser/wpewebkit/wpewebkit.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 44302cd

Please sign in to comment.