From patchwork Tue May 16 18:40:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24030 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94528C7EE23 for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30014.1684262439007231522 for ; Tue, 16 May 2023 11:40:39 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E32D41FB; Tue, 16 May 2023 11:41:22 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9A2703F793; Tue, 16 May 2023 11:40:37 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 1/7] meta: depend on autoconf-archive-native, not autoconf-archive Date: Tue, 16 May 2023 19:40:25 +0100 Message-Id: <20230516184031.2255171-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181414 From: Ross Burton 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. Signed-off-by: Ross Burton --- 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(-) diff --git a/meta/recipes-connectivity/neard/neard_0.18.bb b/meta/recipes-connectivity/neard/neard_0.18.bb index dbd6e3841a1..362a7615b6e 100644 --- a/meta/recipes-connectivity/neard/neard_0.18.bb +++ b/meta/recipes-connectivity/neard/neard_0.18.bb @@ -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 \ diff --git a/meta/recipes-core/dbus/dbus_1.14.6.bb b/meta/recipes-core/dbus/dbus_1.14.6.bb index a6e18a92cbb..da25155773a 100644 --- a/meta/recipes-core/dbus/dbus_1.14.6.bb +++ b/meta/recipes-core/dbus/dbus_1.14.6.bb @@ -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 = "" diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc index d345b914722..0cb3f0e6a6f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc @@ -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" diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 58cb5ca73d3..d31756dbc8b 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -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" diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb index 781ed65da37..d3a7ce2fd93 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb @@ -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 diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb index 1b95cfb4327..7831b4986af 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb @@ -13,7 +13,7 @@ DEPENDS += "xorgproto \ xtrans \ libxcb \ xorgproto-native \ - autoconf-archive \ + autoconf-archive-native \ " PROVIDES = "virtual/libx11" diff --git a/meta/recipes-kernel/powertop/powertop_2.15.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb index 0aae4c93978..65c6d0fcd37 100644 --- a/meta/recipes-kernel/powertop/powertop_2.15.bb +++ b/meta/recipes-kernel/powertop/powertop_2.15.bb @@ -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" diff --git a/meta/recipes-support/icu/icu_72-1.bb b/meta/recipes-support/icu/icu_72-1.bb index 2b20bdd7b23..c2eae5298fc 100644 --- a/meta/recipes-support/icu/icu_72-1.bb +++ b/meta/recipes-support/icu/icu_72-1.bb @@ -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" diff --git a/meta/recipes-support/mpfr/mpfr_4.2.0.bb b/meta/recipes-support/mpfr/mpfr_4.2.0.bb index fead5c38333..31804382e0f 100644 --- a/meta/recipes-support/mpfr/mpfr_4.2.0.bb +++ b/meta/recipes-support/mpfr/mpfr_4.2.0.bb @@ -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" From patchwork Tue May 16 18:40:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96691C77B7A for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30015.1684262439259648118 for ; Tue, 16 May 2023 11:40:39 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A9F502F4; Tue, 16 May 2023 11:41:23 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 61C5E3F793; Tue, 16 May 2023 11:40:38 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 2/7] gobject-introspection: always DEPEND on gobject-introspection-native Date: Tue, 16 May 2023 19:40:26 +0100 Message-Id: <20230516184031.2255171-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516184031.2255171-1-ross.burton@arm.com> References: <20230516184031.2255171-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181415 From: Ross Burton 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. Signed-off-by: Ross Burton --- .../gobject-introspection.bbclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/meta/classes-recipe/gobject-introspection.bbclass b/meta/classes-recipe/gobject-introspection.bbclass index 98edb93761f..65c67ddc721 100644 --- a/meta/classes-recipe/gobject-introspection.bbclass +++ b/meta/classes-recipe/gobject-introspection.bbclass @@ -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 From patchwork Tue May 16 18:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24032 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92B8FC77B75 for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30016.1684262440264615045 for ; Tue, 16 May 2023 11:40:40 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7A5DB150C; Tue, 16 May 2023 11:41:24 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 296213F793; Tue, 16 May 2023 11:40:39 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 3/7] python3-pygobject: remove explicit gobject-introspection DEPENDS Date: Tue, 16 May 2023 19:40:27 +0100 Message-Id: <20230516184031.2255171-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516184031.2255171-1-ross.burton@arm.com> References: <20230516184031.2255171-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181416 From: Ross Burton The gobject-introspection inherit pulls in the dependency for us. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-pygobject_3.44.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb index 8bfff435609..1132e9a9ed3 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb @@ -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" From patchwork Tue May 16 18:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1D6EC7EE2D for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30018.1684262440853254603 for ; Tue, 16 May 2023 11:40:40 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4AD761FB; Tue, 16 May 2023 11:41:25 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EE0243F793; Tue, 16 May 2023 11:40:39 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 4/7] gconf: remove explicit gobject-introspection DEPENDS Date: Tue, 16 May 2023 19:40:28 +0100 Message-Id: <20230516184031.2255171-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516184031.2255171-1-ross.burton@arm.com> References: <20230516184031.2255171-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181417 From: Ross Burton The gobject-introspection inherit does this for us. Signed-off-by: Ross Burton --- meta/recipes-gnome/gnome/gconf_3.2.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb index e712e4729c3..4930aeb9f03 100644 --- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -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 From patchwork Tue May 16 18:40:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1888C7EE24 for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.29900.1684262441633885715 for ; Tue, 16 May 2023 11:40:41 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1BADE2F4; Tue, 16 May 2023 11:41:26 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BE7EE3F793; Tue, 16 May 2023 11:40:40 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 5/7] gi-docgen.bbclass: depends on gobject-introspection-data being enabled Date: Tue, 16 May 2023 19:40:29 +0100 Message-Id: <20230516184031.2255171-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516184031.2255171-1-ross.burton@arm.com> References: <20230516184031.2255171-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181418 From: Ross Burton The gi-docgen tool depends, as it's name suggests, on gobject-introspection being available. Signed-off-by: Ross Burton --- meta/classes-recipe/gi-docgen.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/gi-docgen.bbclass b/meta/classes-recipe/gi-docgen.bbclass index 8b7eaacea3f..eb30c6011f8 100644 --- a/meta/classes-recipe/gi-docgen.bbclass +++ b/meta/classes-recipe/gi-docgen.bbclass @@ -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" From patchwork Tue May 16 18:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24034 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9BA9C7EE2C for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30019.1684262442466477072 for ; Tue, 16 May 2023 11:40:42 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E00F21FB; Tue, 16 May 2023 11:41:26 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8F4DD3F793; Tue, 16 May 2023 11:40:41 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 6/7] python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE Date: Tue, 16 May 2023 19:40:30 +0100 Message-Id: <20230516184031.2255171-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516184031.2255171-1-ross.burton@arm.com> References: <20230516184031.2255171-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181419 From: Ross Burton PyGObject needs gobject-introspection to function, so add a distro features check. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-pygobject_3.44.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb b/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb index 1132e9a9ed3..43125927cd3 100644 --- a/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb +++ b/meta/recipes-devtools/python/python3-pygobject_3.44.1.bb @@ -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" From patchwork Tue May 16 18:40:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 24035 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1B46C7EE2E for ; Tue, 16 May 2023 18:40:44 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.29901.1684262443282545693 for ; Tue, 16 May 2023 11:40:43 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B10F22F4; Tue, 16 May 2023 11:41:27 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5FAB33F793; Tue, 16 May 2023 11:40:42 -0700 (PDT) From: ross.burton@arm.com To: openembedded-core@lists.openembedded.org Cc: alex.kanavin@gmail.com, kubiznak@2n.com Subject: [PATCH 7/7] gstreamer1.0-python: mandate gobject-introspection-data DISTRO_FEATURE Date: Tue, 16 May 2023 19:40:31 +0100 Message-Id: <20230516184031.2255171-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516184031.2255171-1-ross.burton@arm.com> References: <20230516184031.2255171-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 May 2023 18:40:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/181420 From: Ross Burton This layers on top of python3-pygobject, which needs gobject-introspection to work. Signed-off-by: Ross Burton --- .../gstreamer/gstreamer1.0-python_1.22.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.2.bb index 52d987eee5a..ab1600db411 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.2.bb @@ -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"