Re: [OE-core] [PATCH 01/13] gobject-introspection: Fix variable override order
On Fri, 2021-01-29 at 11:31 +0100, Quentin Schulz wrote: > Hi Richard, > > On Fri, Jan 29, 2021 at 10:24:07AM +, Richard Purdie wrote: > > The DEPENDS variable override ordering here was almostly certainly > > incorrect and led to weird behaviour when making changes elsewhere. > > Correct it. > > > > Signed-off-by: Richard Purdie > > --- > > .../gobject-introspection/gobject-introspection_1.66.1.bb | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git > > a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > > b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > > index ee0ab2866b8..ebac8d3a432 100644 > > --- > > a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > > +++ > > b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > > @@ -28,14 +28,14 @@ GTKDOC_MESON_OPTION = "gtk_doc" > > > > MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool > > ${PN}:${bindir}/g-ir-scanner" > > -DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native > > autoconf-archive" > > +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native > > autoconf-archive" > > > > Not sure to understand the reason for this change other than "cleanup"? > > Are you expecting to be able to override DEPENDS from other recipes and > couldn't do so because of the "_append"? > > If that is the case, it seems this patch should be split in two so > there's proper explanation? This is a recipe, not a class so overriding from other recipes isn't an issue here and I maintain that even the classes should really be using +=. What is an issue is how the DEPENDS_append below interacts and also how the native.bbclass remapping interacts with things. I was wrestling with both of those trying to get the code to do the correct thing, probably before realising the bigger issue was the reversed overrides order below. It probably is ultimately a cosmetic change but it seemed to make sense to clean it up whilst in here. To me, it seemed in keeping with the other change and I was already sending enough patches... It is also the combination I tested and I have little interest in separating and testing it individually without the other change which I suspect will break. > > # target build needs qemu to run temporary introspection binaries created > > # on the fly by g-ir-scanner and a native version of itself to run > > # native versions of its own tools during build. > > # Also prelink-rtld is used to find out library dependencies of > > introspection binaries > > # (standard ldd doesn't work when cross-compiling). > > -DEPENDS_class-target_append = " gobject-introspection-native qemu-native > > prelink-native" > > +DEPENDS_append_class-target = " gobject-introspection-native qemu-native > > prelink-native" > > > > Ah, the classic :) Indeed. I do suspect there were issues in the way native class extensions were behaving which may have lead to this :/. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147446): https://lists.openembedded.org/g/openembedded-core/message/147446 Mute This Topic: https://lists.openembedded.org/mt/80206621/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 01/13] gobject-introspection: Fix variable override order
Hi Richard, On Fri, Jan 29, 2021 at 10:24:07AM +, Richard Purdie wrote: > The DEPENDS variable override ordering here was almostly certainly > incorrect and led to weird behaviour when making changes elsewhere. > Correct it. > > Signed-off-by: Richard Purdie > --- > .../gobject-introspection/gobject-introspection_1.66.1.bb | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git > a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > index ee0ab2866b8..ebac8d3a432 100644 > --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb > @@ -28,14 +28,14 @@ GTKDOC_MESON_OPTION = "gtk_doc" > > MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool > ${PN}:${bindir}/g-ir-scanner" > > -DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native > autoconf-archive" > +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native > autoconf-archive" > Not sure to understand the reason for this change other than "cleanup"? Are you expecting to be able to override DEPENDS from other recipes and couldn't do so because of the "_append"? If that is the case, it seems this patch should be split in two so there's proper explanation? > # target build needs qemu to run temporary introspection binaries created > # on the fly by g-ir-scanner and a native version of itself to run > # native versions of its own tools during build. > # Also prelink-rtld is used to find out library dependencies of > introspection binaries > # (standard ldd doesn't work when cross-compiling). > -DEPENDS_class-target_append = " gobject-introspection-native qemu-native > prelink-native" > +DEPENDS_append_class-target = " gobject-introspection-native qemu-native > prelink-native" > Ah, the classic :) Cheers, Quentin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147445): https://lists.openembedded.org/g/openembedded-core/message/147445 Mute This Topic: https://lists.openembedded.org/mt/80206621/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 01/13] gobject-introspection: Fix variable override order
The DEPENDS variable override ordering here was almostly certainly incorrect and led to weird behaviour when making changes elsewhere. Correct it. Signed-off-by: Richard Purdie --- .../gobject-introspection/gobject-introspection_1.66.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb index ee0ab2866b8..ebac8d3a432 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb @@ -28,14 +28,14 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" +DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run # native versions of its own tools during build. # Also prelink-rtld is used to find out library dependencies of introspection binaries # (standard ldd doesn't work when cross-compiling). -DEPENDS_class-target_append = " gobject-introspection-native qemu-native prelink-native" +DEPENDS_append_class-target = " gobject-introspection-native qemu-native prelink-native" # needed for writing out the qemu wrapper script export STAGING_DIR_HOST -- 2.27.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#147432): https://lists.openembedded.org/g/openembedded-core/message/147432 Mute This Topic: https://lists.openembedded.org/mt/80206621/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-