diff mbox series

[v2,2/3] gobject-introspection-data.bbclass: move do_compile() tweak to g-i class

Message ID 20240116110814.1052866-2-alex@linutronix.de
State Accepted, archived
Commit 49988a49f7c9a19aa2a547d49369996e3e20d452
Headers show
Series [v2,1/3] glib-2.0: ensure GI_DATA_ENABLED is set | expand

Commit Message

Alexander Kanavin Jan. 16, 2024, 11:08 a.m. UTC 
g-i-data class is strictly for setting GI_DATA_ENABLED. Any build tweaks
should be in g-i class.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/classes-recipe/gobject-introspection-data.bbclass | 5 -----
 meta/classes-recipe/gobject-introspection.bbclass      | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/gobject-introspection-data.bbclass b/meta/classes-recipe/gobject-introspection-data.bbclass
index 7f522a1ed32..aa04c70ca6c 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 65c67ddc721..d0052cd6231 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"