From 375ac472d848eb6bdd17656cfe005c905025ffab Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 16 Jan 2024 12:08:13 +0100 Subject: gobject-introspection-data.bbclass: move do_compile() tweak to g-i class g-i-data class is strictly for setting GI_DATA_ENABLED. Any build tweaks should be in g-i class. (From OE-Core rev: 49988a49f7c9a19aa2a547d49369996e3e20d452) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes-recipe/gobject-introspection-data.bbclass | 5 ----- meta/classes-recipe/gobject-introspection.bbclass | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/classes-recipe/gobject-introspection-data.bbclass b/meta/classes-recipe/gobject-introspection-data.bbclass index 7f522a1ed3..aa04c70ca6 100644 --- a/meta/classes-recipe/gobject-introspection-data.bbclass +++ b/meta/classes-recipe/gobject-introspection-data.bbclass @@ -11,8 +11,3 @@ # so that qemu use can be avoided when necessary. GI_DATA_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', \ bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d), 'False', d)}" - -do_compile:prepend() { - # This prevents g-ir-scanner from writing cache data to $HOME - export GI_SCANNER_DISABLE_CACHE=1 -} diff --git a/meta/classes-recipe/gobject-introspection.bbclass b/meta/classes-recipe/gobject-introspection.bbclass index 65c67ddc72..d0052cd623 100644 --- a/meta/classes-recipe/gobject-introspection.bbclass +++ b/meta/classes-recipe/gobject-introspection.bbclass @@ -50,6 +50,11 @@ do_configure:prepend:class-target () { cp ${STAGING_DIR_NATIVE}/${datadir}/aclocal/introspection.m4 ${S}/m4 } +do_compile:prepend() { + # This prevents g-ir-scanner from writing cache data to $HOME + export GI_SCANNER_DISABLE_CACHE=1 +} + # .typelib files are needed at runtime and so they go to the main package (so # they'll be together with libraries they support). FILES:${PN}:append = " ${libdir}/girepository-*/*.typelib" -- cgit v1.2.3-54-g00ecf