mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
gobject-introspection: reduce dependencies
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. (From OE-Core rev: 4e51c1815c92bb15977a3bdb14171d770da44004) Signed-off-by: Petr Kubizňák <kubiznak@2n.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
89e29cf2e1
commit
e79fd53d0a
@@ -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
|
||||
}
|
||||
|
||||
# .typelib files are needed at runtime and so they go to the main package (so
|
||||
|
||||
Reference in New Issue
Block a user