public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
* [OE-core][PATCH v3 1/6] gobject-introspection: reduce dependencies
@ 2023-03-24 15:22 Petr Kubizňák
  2023-03-24 15:22 ` [OE-core][PATCH v3 2/6] graphene: add gobject-types PACKAGECONFIG Petr Kubizňák
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Petr Kubizňák @ 2023-03-24 15:22 UTC (permalink / raw)
  To: openembedded-core; +Cc: Petr Kubizňák

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.

Signed-off-by: Petr Kubizňák <kubiznak@2n.com>
---
 meta/classes-recipe/gobject-introspection.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/meta/classes-recipe/gobject-introspection.bbclass b/meta/classes-recipe/gobject-introspection.bbclass
index 0c7b7d200a..98edb93761 100644
--- a/meta/classes-recipe/gobject-introspection.bbclass
+++ b/meta/classes-recipe/gobject-introspection.bbclass
@@ -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
-- 
2.30.2



^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-03-28  7:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-24 15:22 [OE-core][PATCH v3 1/6] gobject-introspection: reduce dependencies Petr Kubizňák
2023-03-24 15:22 ` [OE-core][PATCH v3 2/6] graphene: add gobject-types PACKAGECONFIG Petr Kubizňák
2023-03-24 15:22 ` [OE-core][PATCH v3 3/6] python3-pygobject: depend on gobject-introspection Petr Kubizňák
2023-03-24 15:46   ` Tim Orling
     [not found]   ` <174F6583B00F6A21.25304@lists.openembedded.org>
2023-03-24 15:48     ` Tim Orling
2023-03-24 15:22 ` [OE-core][PATCH v3 4/6] gconf: depend on glib-2.0-native Petr Kubizňák
2023-03-24 15:22 ` [OE-core][PATCH v3 5/6] avahi: " Petr Kubizňák
2023-03-24 15:22 ` [OE-core][PATCH v3 6/6] webkitgtk: add missing dependencies Petr Kubizňák
2023-03-28  7:22 ` [OE-core][PATCH v3 1/6] gobject-introspection: reduce dependencies Alexandre Belloni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox