From: Peter Kjellerstedt Date: Fri, 20 Jan 2023 13:02:53 +0000 (+0100) Subject: librsvg: Only enable the Vala bindings if GObject Introspection is enabled X-Git-Tag: 2022-10.3-langdale~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bf9e22c0ca34595106f5421654cccbce7920cf7;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git librsvg: Only enable the Vala bindings if GObject Introspection is enabled This avoids the following error: configure: error: Vala bindings require GObject Introspection Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 31daea70b18b2b2266bf94063b655aaf142a6166) Signed-off-by: Steve Sakoman --- diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb index b2e93a26844..59278d1b169 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