meta: depend on autoconf-archive-native, not autoconf-archive
PATCH 1/7 meta: depend on autoconf-archive-native, not autoconf-archive
From: Ross Burton <[email protected]>
autoconf-archive is a collection of m4 autoconf macros needed at build-time, and autoconf-archive-native is a suitable provider as there is nothing in the recipe that needs to be cross-compiled.
Also if we use DEPENDS=autoconf-archive then the recipe's -dev package ends up RDEPENDing on autoconf-archive, which isn't correct.
Universally change any DEPENDS on autoconf-archive to the -native form, and add any missing dependencies that were implicit before.
--- meta/recipes-connectivity/neard/neard_0.18.bb | 2 +- meta/recipes-core/dbus/dbus_1.14.6.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +- meta/recipes-extended/wget/wget.inc | 2 +- .../gobject-introspection/gobject-introspection_1.74.0.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb | 2 +- meta/recipes-kernel/powertop/powertop_2.15.bb | 2 +- meta/recipes-support/icu/icu_72-1.bb | 3 +-- meta/recipes-support/mpfr/mpfr_4.2.0.bb | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-)
meta/recipes-connectivity/neard/neard_0.18.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -DEPENDS = "dbus glib-2.0 libnl" +DEPENDS = "dbus glib-2.0 libnl autoconf-archive-native" SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;branch=master \ file://neard.in \
meta/recipes-core/dbus/dbus_1.14.6.bb +1 -1
@@ -42,7 +42,7 @@ PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" -DEPENDS = "expat virtual/libintl autoconf-archive glib-2.0" +DEPENDS = "expat virtual/libintl autoconf-archive-native glib-2.0" RDEPENDS:${PN} += "${PN}-common ${PN}-tools" RDEPENDS:${PN}:class-native = ""
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" SECTION = "base" -DEPENDS = "util-linux attr autoconf-archive" +DEPENDS = "util-linux attr autoconf-archive-native" SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https" S = "${WORKDIR}/git"
meta/recipes-extended/wget/wget.inc +1 -1
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" inherit autotools gettext texinfo update-alternatives pkgconfig -DEPENDS += "autoconf-archive" +DEPENDS += "autoconf-archive-native" EXTRA_OECONF = "--without-libgnutls-prefix --without-libssl-prefix \ --disable-rpath"
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb +1 -1
@@ -27,7 +27,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" -DEPENDS += " 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-native" # 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
meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +1 -1
@@ -13,7 +13,7 @@ DEPENDS += "xorgproto \ xtrans \ libxcb \ xorgproto-native \ - autoconf-archive \ + autoconf-archive-native \ " PROVIDES = "virtual/libx11"
meta/recipes-kernel/powertop/powertop_2.15.bb +1 -1
@@ -2,7 +2,7 @@ SUMMARY = "Power usage tool" DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." HOMEPAGE = "https://01.org/powertop/" BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla" -DEPENDS = "ncurses libnl pciutils autoconf-archive" +DEPENDS = "ncurses libnl pciutils autoconf-archive-native" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
meta/recipes-support/icu/icu_72-1.bb +1 -2
@@ -6,8 +6,7 @@ same results on all platforms." HOMEPAGE = "http://site.icu-project.org/" LICENSE = "ICU" -DEPENDS = "icu-native autoconf-archive" -DEPENDS:class-native = "autoconf-archive-native" +DEPENDS = "icu-native autoconf-archive-native" CVE_PRODUCT = "international_components_for_unicode"
meta/recipes-support/mpfr/mpfr_4.2.0.bb +1 -1
@@ -9,7 +9,7 @@ inherit autotools texinfo LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ " -DEPENDS = "gmp autoconf-archive" +DEPENDS = "gmp autoconf-archive-native" SRC_URI = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz" SRC_URI[sha256sum] = "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993"
Signature · 1 line
2.34.1
PATCH 2/7 gobject-introspection: always DEPEND on gobject-introspection-native
From: Ross Burton <[email protected]>
If a recipe inherits gobject-introspection then there's a good chance that it needs the gobject-introspection-native recipe for the m4 macros in introspection.m4, because we always autoreconf so we always need the macros to be present.
Change the dependencies so that inheriting g-i always adds a dependency on gobject-introspection-native, and a dependency on qemu-native and target gobject-introspection if G-I is enabled.
Partially reverts 4e51c18.
--- .../gobject-introspection.bbclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
meta/classes-recipe/gobject-introspection.bbclass +7 -11
@@ -35,23 +35,19 @@ 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 = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection gobject-introspection-native qemu-native', '', d)}" +DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection qemu-native', '', d)}" -# Even though introspection is disabled on -native, gobject-introspection package is still -# needed for m4 macros. -DEPENDS:append:class-native = " gobject-introspection-native" -DEPENDS:append:class-nativesdk = " gobject-introspection-native" +# Even when introspection is disabled, the gobject-introspection package is still needed for m4 macros. +DEPENDS:append = " gobject-introspection-native" # This is used by introspection tools to find .gir includes export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}" do_configure:prepend:class-target () { - 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 + # introspection.m4 pre-packaged with upstream tarballs does not yet + # have our fixes + mkdir -p ${S}/m4 + cp ${STAGING_DIR_NATIVE}/${datadir}/aclocal/introspection.m4 ${S}/m4 } # .typelib files are needed at runtime and so they go to the main package (so
Signature · 1 line
2.34.1
PATCH 3/7 python3-pygobject: remove explicit gobject-introspection DEPENDS
In reply to [email protected]From: Ross Burton <[email protected]>
The gobject-introspection inherit pulls in the dependency for us.
--- meta/recipes-devtools/python/python3-pygobject_3.44.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/python/python3-pygobject_3.44.1.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 gobject-introspection" +DEPENDS += "python3 glib-2.0" SRCNAME="pygobject"
Signature · 1 line
2.34.1
PATCH 4/7 gconf: remove explicit gobject-introspection DEPENDS
In reply to [email protected]From: Ross Burton <[email protected]>
The gobject-introspection inherit does this for us.
--- 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 glib-2.0-native gobject-introspection 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.34.1
Re: [PATCH 4/7] gconf: remove explicit gobject-introspection DEPENDS
With the patch 2/7 applied, the gobject-introspection inherit pulls in gobject-introspection-native, not gobject-introspection dependency. Is this sufficient? Please make sure it builds with g-i disabled.
Petr
________________________________________
From: [email protected] <[email protected]>
Sent: Tuesday, May 16, 2023 8:40 PM
To: [email protected]
Cc: [email protected]; Petr Kubizňák - 2N
Subject: [PATCH 4/7] gconf: remove explicit gobject-introspection DEPENDS
From: Ross Burton <[email protected]>
The gobject-introspection inherit does this for us.
--- 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 glib-2.0-native gobject-introspection 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
--
2.34.1
Re: [PATCH 4/7] gconf: remove explicit gobject-introspection DEPENDS
Quoted 2 lines · On 18 May 2023, at 11:57, Petr Kubizňák - 2N <[email protected]> wrote:
With the patch 2/7 applied, the gobject-introspection inherit pulls in gobject-introspection-native, not gobject-introspection dependency. Is this sufficient? Please make sure it builds with g-i disabled.
It does: it _always_ needs g-i-native for the m4 macros, so that configure can run. Target g-i is only needed if enabled.
Ross
PATCH 5/7 gi-docgen.bbclass: depends on gobject-introspection-data being enabled
In reply to [email protected]From: Ross Burton <[email protected]>
The gi-docgen tool depends, as it's name suggests, on gobject-introspection being available.
--- meta/classes-recipe/gi-docgen.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes-recipe/gi-docgen.bbclass +2 -1
@@ -10,7 +10,8 @@ # This variable is set to True if api-documentation is in # DISTRO_FEATURES, and False otherwise. -GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'True', 'False', d)}" +GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation gobject-introspection-data', 'True', 'False', d)}" + # When building native recipes, disable gi-docgen, as it is not necessary, # pulls in additional dependencies, and makes build times longer GIDOCGEN_ENABLED:class-native = "False"
Signature · 1 line
2.34.1
Re: [PATCH 5/7] gi-docgen.bbclass: depends on gobject-introspection-data being enabled
The comment before the modified line does not match now.
Petr
________________________________________
From: [email protected] <[email protected]>
Sent: Tuesday, May 16, 2023 8:40 PM
To: [email protected]
Cc: [email protected]; Petr Kubizňák - 2N
Subject: [PATCH 5/7] gi-docgen.bbclass: depends on gobject-introspection-data being enabled
From: Ross Burton <[email protected]>
The gi-docgen tool depends, as it's name suggests, on gobject-introspection being available.
--- meta/classes-recipe/gi-docgen.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes-recipe/gi-docgen.bbclass +2 -1
@@ -10,7 +10,8 @@ # This variable is set to True if api-documentation is in # DISTRO_FEATURES, and False otherwise. -GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'True', 'False', d)}" +GIDOCGEN_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation gobject-introspection-data', 'True', 'False', d)}" + # When building native recipes, disable gi-docgen, as it is not necessary, # pulls in additional dependencies, and makes build times longer GIDOCGEN_ENABLED:class-native = "False"
--
2.34.1
PATCH 6/7 python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
In reply to [email protected]From: Ross Burton <[email protected]>
PyGObject needs gobject-introspection to function, so add a distro features check.
--- meta/recipes-devtools/python/python3-pygobject_3.44.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-devtools/python/python3-pygobject_3.44.1.bb +3 -1
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = "" -inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even +inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" DEPENDS += "python3 glib-2.0"
Signature · 1 line
2.34.1
Re: [PATCH 6/7] python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
With gobject-introspection in DEPENDS, PyGObject builds always, even if gobject-introspection-data is not in DISTRO_FEATURES. Is this conditional approach better?
Petr
________________________________________
From: [email protected] <[email protected]>
Sent: Tuesday, May 16, 2023 8:40 PM
To: [email protected]
Cc: [email protected]; Petr Kubizňák - 2N
Subject: [PATCH 6/7] python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
From: Ross Burton <[email protected]>
PyGObject needs gobject-introspection to function, so add a distro features check.
--- meta/recipes-devtools/python/python3-pygobject_3.44.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-devtools/python/python3-pygobject_3.44.1.bb +3 -1
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = "" -inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even +inherit gnomebase setuptools3-base gobject-introspection upstream-version-is-even features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" DEPENDS += "python3 glib-2.0"
--
2.34.1
Re: [PATCH 6/7] python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
Quoted 2 lines · On 18 May 2023, at 11:49, Petr Kubizňák - 2N <[email protected]> wrote:
With gobject-introspection in DEPENDS, PyGObject builds always, even if gobject-introspection-data is not in
DISTRO_FEATURES. Is this conditional approach better?
Builds is not the same as is useful.
PyGObject uses G-I to interface to GObject itself.
Without qemu-usermode, gobject-introspection is a stub, as can be shown by comparing gobject-introspection with and without qemu-usermode:
Changes to packages/cortexa57-poky-linux/gobject-introspection (sysroot):
/usr/lib/girepository-1.0 was removed /usr/lib/girepository-1.0/Gio-2.0.typelib was removed /usr/lib/girepository-1.0/GIRepository-2.0.typelib was removed
…
The target gobject-introspection recipe should also refuse to build unless GI is enabled.
Ross
Re: [OE-core] [PATCH 6/7] python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
Ross, are you going to add REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" to these as well?
ERROR: Nothing PROVIDES 'python3-pygobject' (but meta-oe/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb DEPENDS on or otherwise requires it)
python3-pygobject was skipped: missing required distro feature 'gobject-introspection-data' (not in DISTRO_FEATURES)
ERROR: Nothing RPROVIDES 'python3-pygobject' (but meta-oe/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/ firewalld_1.2.0.bb, meta-oe/meta-networking/recipes-daemons/networkd-dispatcher/ networkd-dispatcher_2.1.bb, oe-core/meta/recipes-devtools/python/ python3-dbusmock_0.28.7.bb, meta-oe/meta-python/recipes-devtools/python/ python3-pydbus_0.6.0.bb, meta-oe/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb, meta-oe/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb RDEPENDS on or otherwise requires it)
python3-pygobject was skipped: missing required distro feature 'gobject-introspection-data' (not in DISTRO_FEATURES)
There are probably few more, e.g. python3-pydbus-manager which rdepends on python3-pydbus.
Regards,
Quoted 34 lines · Ross Burton
Quoted 2 lines · On 18 May 2023, at 11:49, Petr Kubizňák - 2N <[email protected]> wrote:
With gobject-introspection in DEPENDS, PyGObject builds always, even if
gobject-introspection-data is not in
DISTRO_FEATURES. Is this conditional approach better?Builds is not the same as is useful.
PyGObject uses G-I to interface to GObject itself.
Without qemu-usermode, gobject-introspection is a stub, as can be shown by comparing gobject-introspection with and without qemu-usermode:
Changes to packages/cortexa57-poky-linux/gobject-introspection (sysroot):
/usr/lib/girepository-1.0was removed/usr/lib/girepository-1.0/Gio-2.0.typelibwas removed/usr/lib/girepository-1.0/GIRepository-2.0.typelibwas removed
…The target gobject-introspection recipe should also refuse to build unless GI is enabled.
Ross
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#181598):
https://lists.openembedded.org/g/openembedded-core/message/181598
Mute This Topic: https://lists.openembedded.org/mt/98932959/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 6/7] python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
Quoted 10 lines · Martin Jansa
Ross, are you going to add
REQUIRED_DISTRO_FEATURES= "gobject-introspection-data" to these as well?ERROR: Nothing PROVIDES 'python3-pygobject' (but meta-oe/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb DEPENDS on or otherwise requires it) python3-pygobject was skipped: missing required distro feature 'gobject-introspection-data' (not in
DISTRO_FEATURES)ERROR: Nothing RPROVIDES 'python3-pygobject' (but meta-oe/meta-networking/dynamic-layers/meta-python/recipes-connectivity/firewalld/firewalld_1.2.0.bb, meta-oe/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb, oe-core/meta/recipes-devtools/python/python3-dbusmock_0.28.7.bb, meta-oe/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb, meta-oe/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb, meta-oe/meta-python/recipes-devtools/python/python3-asyncio-glib_0.1.bb RDEPENDS on or otherwise requires it) python3-pygobject was skipped: missing required distro feature 'gobject-introspection-data' (not in
DISTRO_FEATURES)There are probably few more, e.g. python3-pydbus-manager which rdepends on python3-pydbus.
The pydbus recipes are incredibly obsolete so I took the executive decision to propose removing those, but fixed the others.
Ross
PATCH 7/7 gstreamer1.0-python: mandate gobject-introspection-data DISTRO_FEATURE
In reply to [email protected]From: Ross Burton <[email protected]>
This layers on top of python3-pygobject, which needs gobject-introspection to work.
--- .../gstreamer/gstreamer1.0-python_1.22.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.2.bb +3 -1
@@ -23,6 +23,8 @@ EXTRA_OEMESON += "\ -Dlibpython-dir=${libdir} \ " -inherit meson pkgconfig setuptools3-base upstream-version-is-even +inherit meson pkgconfig setuptools3-base upstream-version-is-even features_check FILES:${PN} += "${libdir}/gstreamer-1.0" + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
Signature · 1 line
2.34.1