gobject-introspection: reduce dependencies
PATCH v3 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
@@ -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
PATCH v3 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
@@ -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
PATCH v3 3/6 python3-pygobject: depend on gobject-introspection
In reply to Petr KubizňákWhen 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
@@ -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
Re: [OE-core][PATCH v3 3/6] python3-pygobject: depend on gobject-introspection
Quoted 19 lines · 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.
Signed-off-by Petr Kubizňák <[email protected]>--- 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 +0
-0@@ -10,7 +10,7 @@ GIR_MESON_OPTION = "" inherit gnomebase setuptools3-base gobject-introspectionupstream-version-is-even
meta/recipes-devtools/python/python3-pygobject_3.42.2.bb GIR_MESON_OPTION = "" · line 13
Quoted 2 lines
meta/recipes-devtools/python/python3-pygobject_3.42.2.bb +1
-1-DEPENDS += "python3 glib-2.0" +DEPENDS += "python3 glib-2.0 gobject-introspection"
This is not needed. It is already added by the inherited gobject-introspection class
https://git.yoctoproject.org/poky/tree/meta/classes-recipe/gobject-introspection.bbclass#n38
Quoted 1 line
SRCNAME="pygobject"
Quoted 16 lines
--
2.30.2-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#179064):
https://lists.openembedded.org/g/openembedded-core/message/179064
Mute This Topic: https://lists.openembedded.org/mt/97825895/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core][PATCH v3 3/6] python3-pygobject: depend on gobject-introspection
Quoted 22 lines · Tim Orling via lists.openembedded.org
Quoted 18 lines · 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.
Signed-off-by Petr Kubizňák <[email protected]>--- 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 +0
-0@@ -10,7 +10,7 @@ GIR_MESON_OPTION = "" inherit gnomebase setuptools3-base gobject-introspectionupstream-version-is-even
Quoted 10 lines
meta/recipes-devtools/python/python3-pygobject_3.42.2.bb GIR_MESON_OPTION = "" · line 13
Quoted 3 lines
meta/recipes-devtools/python/python3-pygobject_3.42.2.bb +1
-1-DEPENDS += "python3 glib-2.0" +DEPENDS += "python3 glib-2.0 gobject-introspection"This is not needed. It is already added by the inherited gobject-introspection class
https://git.yoctoproject.org/poky/tree/meta/classes-recipe/gobject-introspection.bbclass#n38
I had not yet read the previous patch to the class. Ignore this comment for now, but this feels like a step backward.
Quoted 22 lines
SRCNAME="pygobject"
Quoted 8 lines
--
2.30.2-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#179072):
https://lists.openembedded.org/g/openembedded-core/message/179072
Mute This Topic: https://lists.openembedded.org/mt/97825895/924729
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
PATCH v3 4/6 gconf: depend on glib-2.0-native
In reply to Petr KubizňákWhen gobject-introspection feature is disabled, glib-2.0-native package dependency is not pulled in, which causes a failure in do_configure due to missing 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
@@ -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 dbus dbus-glib libxml2 intltool-native" inherit gnomebase gtk-doc gettext gobject-introspection gio-module-cache
Signature · 1 line
2.30.2
PATCH v3 5/6 avahi: depend on glib-2.0-native
In reply to Petr KubizňákWhen gobject-introspection feature is disabled, glib-2.0-native package dependency is not pulled in, which causes a failure in do_compile due to missing glib-mkenums.
--- meta/recipes-connectivity/avahi/avahi_0.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/avahi/avahi_0.8.bb +1 -1
@@ -35,7 +35,7 @@ SRC_URI[sha256sum] = "060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de79 # Issue only affects Debian/SUSE, not us CVE_CHECK_IGNORE += "CVE-2021-26720" -DEPENDS = "expat libcap libdaemon glib-2.0" +DEPENDS = "expat libcap libdaemon glib-2.0 glib-2.0-native" # For gtk related PACKAGECONFIGs: gtk, gtk3 AVAHI_GTK ?= ""
Signature · 1 line
2.30.2
PATCH v3 6/6 webkitgtk: add missing dependencies
In reply to Petr KubizňákWhen gobject-introspection feature is disabled, gettext 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +2 -1
@@ -17,7 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ " SRC_URI[sha256sum] = "40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7" -inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen +inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen gettext ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}"
@@ -38,6 +38,7 @@ DEPENDS += " \ libnotify \ gstreamer1.0 \ gstreamer1.0-plugins-base \ + glib-2.0-native \ " PACKAGECONFIG_SOUP ?= "soup3"
Signature · 1 line
2.30.2
Hello,
This series seems to break the qemux86-64-x32 build:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/6763/steps/12/logs/stdio
| Program glib-mkenums mkenums found: NO | | ../libgudev-237/gudev/meson.build:40:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable | | A full log can be found at /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/libgudev/237-r0/build/meson-logs/meson-log.txt | ERROR: meson failed | WARNING: /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/libgudev/237-r0/temp/run.do_configure.3177824:183 exit 1 from 'exit 1' | WARNING: Backtrace (BB generated script): | #1: bbfatal_log, /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/libgudev/237-r0/temp/run.do_configure.3177824, line 183 | #2: meson_do_configure, /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/libgudev/237-r0/temp/run.do_configure.3177824, line 172 | #3: do_configure, /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/libgudev/237-r0/temp/run.do_configure.3177824, line 158 | #4: main, /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/libgudev/237-r0/temp/run.do_configure.3177824, line 196
NOTE: recipe libgudev-237-r0: task do_configure: Failed
ERROR: Task (/home/pokybuild/yocto-worker/qemux86-64-x32/build/meta/recipes-gnome/libgudev/libgudev_237.bb:do_configure) failed with exit code '1'
Quoted 54 lines · Petr Kubizňák
When
GI_DATA_ENABLEDis 'False' (e.g. because 'gobject-introspection-data' is not inDISTRO_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.Signed-off-by Petr Kubizňák <[email protected]>--- meta/classes-recipe/gobject-introspection.bbclass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)meta/classes-recipe/gobject-introspection.bbclass +7
-5@@ -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 (soSignature · 11 lines
2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#179062): https://lists.openembedded.org/g/openembedded-core/message/179062 Mute This Topic: https://lists.openembedded.org/mt/97825893/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com