From ce5f961acd3efc1571443e3f99cc6fa8db5e234f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 16 May 2023 19:40:26 +0100 Subject: gobject-introspection: always DEPEND on gobject-introspection-native 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. (From OE-Core rev: 2763bc8c3a8d789ddc8e22e6df69400dcba6d6f3) Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/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 98edb93761..65c67ddc72 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 -- cgit v1.2.3-54-g00ecf