On Mon, Apr 3, 2023 at 1:08 PM Petr Kubizňák <kubiz...@2n.com> wrote:
> 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.
>
> Signed-off-by: Petr Kubizňák <kubiz...@2n.com>
> ---
> meta/classes-recipe/gobject-introspection.bbclass | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes-recipe/gobject-introspection.bbclass
> b/meta/classes-recipe/gobject-introspection.bbclass
> index 0c7b7d200a..98edb93761 100644
> --- a/meta/classes-recipe/gobject-introspection.bbclass
> +++ b/meta/classes-recipe/gobject-introspection.bbclass
> @@ -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
>
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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#181243):
https://lists.openembedded.org/g/openembedded-core/message/181243
Mute This Topic: https://lists.openembedded.org/mt/98032505/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
