Skip to contentSkip to conversation

gobject-introspection: reduce dependencies

PATCH In review Petr Kubizňák 4 participants 12 messages Apr 3, 2023 – May 16, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/6 gobject-introspection: reduce dependencies

When GI_DATA_ENABLED is 'False' (e.g. because 'gobject-introspection-data' is not in DISTRO_FEATURES), gobject-introspection, gobject-introspection-native and qemu-native should not be added to DEPENDS. This is to reduce dependency chain when g-i is disabled.

---
 meta/classes-recipe/gobject-introspection.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/classes-recipe/gobject-introspection.bbclass +7 -5
index 0c7b7d200a..98edb93761 100644
@@ -35,7 +35,7 @@ EXTRA_OEMESON:prepend:class-nativesdk = "${@['', '${GIRMESONBUILD}'][d.getVar('G
 
 # Generating introspection data depends on a combination of native and target
 # introspection tools, and qemu to run the target tools.
-DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native"
+DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection gobject-introspection-native qemu-native', '', d)}"
 
 # Even though introspection is disabled on -native, gobject-introspection package is still
 # needed for m4 macros.
@@ -46,10 +46,12 @@ DEPENDS:append:class-nativesdk = " gobject-introspection-native"
 export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}"
 
 do_configure:prepend:class-target () {
-    # introspection.m4 pre-packaged with upstream tarballs does not yet
-    # have our fixes
-    mkdir -p ${S}/m4
-    cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    if [ "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '1', '0', d)}" = "1" ] ; then
+        # introspection.m4 pre-packaged with upstream tarballs does not yet
+        # have our fixes
+        mkdir -p ${S}/m4
+        cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    fi
 }
 
 # .typelib files are needed at runtime and so they go to the main package (so
Signature · 1 line
2.30.2
#1 lore raw

PATCH v5 2/6 graphene: add gobject-types PACKAGECONFIG

Add an option to enable/disable build of graphene-gobject. When enabled, add glib dependency (not pulled in implicitly if the gobject-introspection feature is disabled).

Default is to enable gobject-types so that graphene-gobject is built (dependency of gtk4).

---
 meta/recipes-graphics/graphene/graphene_1.10.8.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-graphics/graphene/graphene_1.10.8.bb +2 -1
index 120ee80b17..9f5b4d0e2d 100644
@@ -11,8 +11,9 @@ SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da3
 
 # Disable neon support by default on ARM-32 platforms because of the
 # following upstream bug: https://github.com/ebassi/graphene/issues/215
-PACKAGECONFIG ?= "${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
+PACKAGECONFIG ?= "gobject-types ${@bb.utils.contains('TUNE_FEATURES', 'aarch64', 'neon', '', d)}"
 
+PACKAGECONFIG[gobject-types] = "-Dgobject_types=true,-Dgobject_types=false,glib-2.0"
 PACKAGECONFIG[neon] = "-Darm_neon=true,-Darm_neon=false,"
 
 GIR_MESON_ENABLE_FLAG = 'enabled'
Signature · 1 line
2.30.2
#2 lore raw

PATCH v5 3/6 python3-pygobject: depend on gobject-introspection

In reply to Petr Kubizňák

When g-i feature is disabled, the gobject-introspection package dependency is not pulled in but pygobject has a hard dependency on it.

---
 meta/recipes-devtools/python/python3-pygobject_3.42.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3-pygobject_3.42.2.bb +1 -1
index cc7b07e804..f54f4ce784 100644
@@ -10,7 +10,7 @@ GIR_MESON_OPTION = ""
 
 inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even
 
-DEPENDS += "python3 glib-2.0"
+DEPENDS += "python3 glib-2.0 gobject-introspection"
 
 SRCNAME="pygobject"
 
Signature · 1 line
2.30.2
#3 lore raw

PATCH v5 4/6 gconf: add missing dependencies

In reply to Petr Kubizňák

When gobject-introspection feature is disabled, glib-2.0-native and gobject-introspection package dependencies are not pulled in but gconf has a hard dependency on them (do_configure fails due to missing introspection.m4 file and glib-gettextize).

---
 meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/gnome/gconf_3.2.6.bb +1 -1
index 776f6091aa..e712e4729c 100644
@@ -7,7 +7,7 @@ HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native"
+DEPENDS = "glib-2.0 glib-2.0-native gobject-introspection dbus dbus-glib libxml2 intltool-native"
 
 inherit gnomebase gtk-doc gettext gobject-introspection gio-module-cache
 
Signature · 1 line
2.30.2
#4 lore raw

PATCH v5 5/6 webkitgtk: add missing dependencies

In reply to Petr Kubizňák

When gobject-introspection feature is disabled, gettext-native and glib-2.0-native dependencies are not pulled in, which causes failures in do_compile due to missing xgettext and gdbus-codegen.

---
 meta/recipes-sato/webkit/webkitgtk_2.38.5.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +2 -0
index 832c8327dd..36c6233b33 100644
@@ -38,6 +38,8 @@ DEPENDS += " \
           libnotify \
           gstreamer1.0 \
           gstreamer1.0-plugins-base \
+          glib-2.0-native \
+          gettext-native \
           "
 
 PACKAGECONFIG_SOUP ?= "soup3"
Signature · 1 line
2.30.2
#5 lore raw

PATCH v5 6/6 libnotify: depend on glib-2.0-native

In reply to Petr Kubizňák

When gobject-introspection feature is disabled, glib-2.0-native package dependency is not pulled in but libnotify has a hard dependency on it (do_configure fails due to missing glib-mkenums).

---
 meta/recipes-gnome/libnotify/libnotify_0.8.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/libnotify/libnotify_0.8.2.bb +1 -1
index bbfc217df1..b1656fe0fe 100644
@@ -9,7 +9,7 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-DEPENDS = "dbus glib-2.0 gdk-pixbuf"
+DEPENDS = "dbus glib-2.0 glib-2.0-native gdk-pixbuf"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gtk+3"
Signature · 1 line
2.30.2
#6 lore raw
In reply to Petr Kubizňák
Quoted 47 lines · Petr Kubizňák

When GI_DATA_ENABLED is 'False' (e.g. because 'gobject-introspection-data' is not in DISTRO_FEATURES), gobject-introspection, gobject-introspection-native and qemu-native should not be added to DEPENDS. This is to reduce dependency chain when g-i is disabled.

---
 meta/classes-recipe/gobject-introspection.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/classes-recipe/gobject-introspection.bbclass +0 -0
index 0c7b7d200a..98edb93761 100644
@@ -35,7 +35,7 @@ EXTRA_OEMESON:prepend:class-nativesdk = "${@['',

'${GIRMESONBUILD}'][d.getVar('G

# Generating introspection data depends on a combination of native and
target

 # introspection tools, and qemu to run the target tools.
-DEPENDS:append:class-target = " gobject-introspection
gobject-introspection-native qemu-native"
+DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED',
'True', 'gobject-introspection gobject-introspection-native qemu-native',
'', d)}"

# Even though introspection is disabled on -native, gobject-introspection
package is still

 # needed for m4 macros.
meta/classes-recipe/gobject-introspection.bbclass +0 -0
@@ -46,10 +46,12 @@ DEPENDS:append:class-nativesdk = "

gobject-introspection-native"
export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}"

do_configure:prepend:class-target () {

meta/classes-recipe/gobject-introspection.bbclass +1 -4
-    # introspection.m4 pre-packaged with upstream tarballs does not yet
-    # have our fixes
-    mkdir -p ${S}/m4
-    cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    if [ "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '1', '0', d)}"

= "1" ] ; then
+ # introspection.m4 pre-packaged with upstream tarballs does not
yet

meta/classes-recipe/gobject-introspection.bbclass +3 -0
+        # have our fixes
+        mkdir -p ${S}/m4
+        cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4
Quoted 3 lines

${S}/m4
+ fi

Was this extra .m4 file causing issues in builds without gobject-introspection-data in DISTRO_FEATURES?

I've noticed some maybe unexpected side-effects from this change, see:
libblockdev:
https://lists.openembedded.org/g/openembedded-devel/message/102599
glade: https://lists.openembedded.org/g/openembedded-devel/message/102601

#7 lore raw
Quoted 12 lines · Martin Jansa via lists.openembedded.org

do_configure:prepend:class-target () {

meta/classes-recipe/gobject-introspection.bbclass +6 -4
-    # introspection.m4 pre-packaged with upstream tarballs does not yet
-    # have our fixes
-    mkdir -p ${S}/m4
-    cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    if [ "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '1', '0', d)}" = "1" ] ; then
+        # introspection.m4 pre-packaged with upstream tarballs does not yet
+        # have our fixes
+        mkdir -p ${S}/m4
+        cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    fi
Quoted 5 lines

Was this extra .m4 file causing issues in builds without gobject-introspection-data in DISTRO_FEATURES?

I've noticed some maybe unexpected side-effects from this change, see:
libblockdev: https://lists.openembedded.org/g/openembedded-devel/message/102599
glade: https://lists.openembedded.org/g/openembedded-devel/message/102601

That would be from:

-DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native"
+DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection gobject-introspection-native qemu-native', '', d)}”

As the comment below explains:

# Even though introspection is disabled on -native, gobject-introspection package is still

# needed for m4 macros.

g-i-native will *always* be needed as a build dependency, because packages built from git may not have any m4 macros in.

Ross

#8 lore raw

Hi Martin and Ross,

My original intention was to only condition the dependency on gobject-introspection but the reviewers were convinced the -native packages should be handled the same, see https://lists.openembedded.org/g/openembedded-core/message/175475 . That triggered a set of patches like https://lists.openembedded.org/g/openembedded-core/message/179620 . The result is passing the builds but honestly I'm not surprised about side-effects, sorry for that.

The key question is whether the problematic packages have intrinsic dependency on g-i-native, which can (and should) be fixed by adding the package in DEPENDS directly, or g-i-native is always needed as Ross says, which would imply g-i-native should not be conditioned by GI_DATA_ENABLED in the class.

I'm not an expert on g-i so I didn't have strong arguments but feel free to convince Alex that g-i-native should be always in DEPENDS.

Petr

________________________________________
From: Ross Burton <[email protected]>
Sent: Monday, May 15, 2023 3:58 PM
To: [email protected]
Cc: Petr Kubizňák - 2N; [email protected]
Subject: Re: [OE-core][PATCH v5 1/6] gobject-introspection: reduce dependencies

Quoted 12 lines · Martin Jansa via lists.openembedded.org

do_configure:prepend:class-target () {

meta/classes-recipe/gobject-introspection.bbclass +6 -4
-    # introspection.m4 pre-packaged with upstream tarballs does not yet
-    # have our fixes
-    mkdir -p ${S}/m4
-    cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    if [ "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '1', '0', d)}" = "1" ] ; then
+        # introspection.m4 pre-packaged with upstream tarballs does not yet
+        # have our fixes
+        mkdir -p ${S}/m4
+        cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
+    fi
Quoted 5 lines

Was this extra .m4 file causing issues in builds without gobject-introspection-data in DISTRO_FEATURES?

I've noticed some maybe unexpected side-effects from this change, see:
libblockdev: https://lists.openembedded.org/g/openembedded-devel/message/102599
glade: https://lists.openembedded.org/g/openembedded-devel/message/102601

That would be from:

-DEPENDS:append:class-target = " gobject-introspection gobject-introspection-native qemu-native"
+DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection gobject-introspection-native qemu-native', '', d)}”

As the comment below explains:

# Even though introspection is disabled on -native, gobject-introspection package is still

# needed for m4 macros.

g-i-native will *always* be needed as a build dependency, because packages built from git may not have any m4 macros in.

Ross

#9 lore raw
Quoted 6 lines · On 15 May 2023, at 15:49, Petr Kubizňák - 2N <[email protected]> wrote:

The key question is whether the problematic packages have intrinsic dependency on g-i-native, which can (and should) be fixed by adding the package in DEPENDS directly, or g-i-native is always needed as Ross says, which would imply g-i-native should not be conditioned by GI_DATA_ENABLED in the class.

I'm not an expert on g-i so I didn't have strong arguments but feel free to convince Alex that g-i-native should be always in DEPENDS.

If we grab a package from git that has a empty m4/ and it has optional support for G-I then it needs a dependency on gobject-introspection-native so that it has introspection.m4 available.

We already inherit gobject-introspection.bbclass, so the dependency can be there. I don’t see why g-i.bbclass would only pull in fundamental build dependencies when it’s enabled.

Ross

#10 lore raw

I don't have a strong opinion here. Petr wanted to trim dependencies down to bare minimum, but if we need to strike a more reasonable balance, that's fine.

Alex

Quoted 13 lines · Ross Burton
Quoted 7 lines · On 15 May 2023, at 15:49, Petr Kubizňák - 2N <[email protected]> wrote:

The key question is whether the problematic packages have intrinsic dependency on g-i-native, which can (and should) be fixed by adding the package in DEPENDS directly, or g-i-native is always needed as Ross says, which would imply g-i-native should not be conditioned by GI_DATA_ENABLED in the class.

I'm not an expert on g-i so I didn't have strong arguments but feel free to convince Alex that g-i-native should be always in DEPENDS.

If we grab a package from git that has a empty m4/ and it has optional support for G-I then it needs a dependency on gobject-introspection-native so that it has introspection.m4 available.

We already inherit gobject-introspection.bbclass, so the dependency can be there. I don’t see why g-i.bbclass would only pull in fundamental build dependencies when it’s enabled.

Ross

#11 lore raw
In reply to Ross Burton
Quoted 4 lines · Ross Burton via lists.openembedded.org

g-i-native will *always* be needed as a build dependency, because packages built from git may not have any m4 macros in.

I have a patch, just giving it a soak test.

Ross