summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2023-05-16 19:40:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-22 10:53:48 +0100
commitce5f961acd3efc1571443e3f99cc6fa8db5e234f (patch)
tree817a6b16193ecef188471693720da7dc7e40c7dc /meta/classes-recipe
parent19d9114042c4c31f627c7d4c7ebd66a2d31504c0 (diff)
downloadpoky-ce5f961acd3efc1571443e3f99cc6fa8db5e234f.tar.gz
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 <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/gobject-introspection.bbclass18
1 files 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
35 35
36# Generating introspection data depends on a combination of native and target 36# Generating introspection data depends on a combination of native and target
37# introspection tools, and qemu to run the target tools. 37# introspection tools, and qemu to run the target tools.
38DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection gobject-introspection-native qemu-native', '', d)}" 38DEPENDS:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'gobject-introspection qemu-native', '', d)}"
39 39
40# Even though introspection is disabled on -native, gobject-introspection package is still 40# Even when introspection is disabled, the gobject-introspection package is still needed for m4 macros.
41# needed for m4 macros. 41DEPENDS:append = " gobject-introspection-native"
42DEPENDS:append:class-native = " gobject-introspection-native"
43DEPENDS:append:class-nativesdk = " gobject-introspection-native"
44 42
45# This is used by introspection tools to find .gir includes 43# This is used by introspection tools to find .gir includes
46export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}" 44export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}"
47 45
48do_configure:prepend:class-target () { 46do_configure:prepend:class-target () {
49 if [ "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '1', '0', d)}" = "1" ] ; then 47 # introspection.m4 pre-packaged with upstream tarballs does not yet
50 # introspection.m4 pre-packaged with upstream tarballs does not yet 48 # have our fixes
51 # have our fixes 49 mkdir -p ${S}/m4
52 mkdir -p ${S}/m4 50 cp ${STAGING_DIR_NATIVE}/${datadir}/aclocal/introspection.m4 ${S}/m4
53 cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4
54 fi
55} 51}
56 52
57# .typelib files are needed at runtime and so they go to the main package (so 53# .typelib files are needed at runtime and so they go to the main package (so