| Message ID | 20230111134014.3220014-1-ovidiu.panait@eng.windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | webkitgtk: fix perl-native dependency | expand |
On Wed, 2023-01-11 at 15:40 +0200, Ovidiu Panait wrote: > From: Ovidiu Panait <ovidiu.panait@windriver.com> > > Currently, perl-native is missing from DEPENDS for webkitgtk even though > perlnative bbclass is inherited. This happens because the DEPENDS variable is > reassigned right after perlnative class is inherited: > > inherit perlnative (DEPENDS += "perl-native") > ... > DEPENDS = " \ > ..." > > Move the inherit after DEPENDS reassignment in order to make sure > perl-native is explicitly added as a dependency. > > Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> > --- > meta/recipes-sato/webkit/webkitgtk_2.38.3.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb > index e890079dc5..bf2db3c33a 100644 > --- a/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb > +++ b/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb > @@ -17,8 +17,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ > " > SRC_URI[sha256sum] = "41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a" > > -inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen > - > ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" > > @@ -40,6 +38,8 @@ DEPENDS = " \ > gstreamer1.0-plugins-base \ > " > > +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen > + > PACKAGECONFIG_SOUP ?= "soup3" > PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ Whilst this fix works, it feels fragile to me. Could we change the problematic DEPENDS line to use += instead? Cheers, Richard
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb index e890079dc5..bf2db3c33a 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.38.3.bb @@ -17,8 +17,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ " SRC_URI[sha256sum] = "41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a" -inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen - ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" @@ -40,6 +38,8 @@ DEPENDS = " \ gstreamer1.0-plugins-base \ " +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen + PACKAGECONFIG_SOUP ?= "soup3" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \