From 8339c19719092dc8a38c055d90b3a52514a3af15 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 20 Jan 2023 14:02:53 +0100 Subject: librsvg: Only enable the Vala bindings if GObject Introspection is enabled This avoids the following error: configure: error: Vala bindings require GObject Introspection (From OE-Core rev: 31daea70b18b2b2266bf94063b655aaf142a6166) Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb index b2e93a2684..59278d1b16 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb @@ -42,8 +42,6 @@ do_configure[postfuncs] += "cargo_common_do_configure" inherit rust-target-config -EXTRA_OECONF:class-target = "--enable-vala" - # rust-cross writes the target linker binary into target json definition without any flags. # This breaks here because the linker isn't going to work without at least knowing where # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class @@ -58,8 +56,10 @@ CVE_CHECK_IGNORE += "CVE-2018-1000041" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" PACKAGECONFIG ??= "gdkpixbuf" +PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vala', '', d)}" # The gdk-pixbuf loader PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" do_install:append() { # Loadable modules don't need .a or .la on Linux -- cgit v1.2.3-54-g00ecf