diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2023-01-20 14:02:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-24 22:06:51 +0000 |
commit | 8339c19719092dc8a38c055d90b3a52514a3af15 (patch) | |
tree | d8f92c2c2dc9173d74bc77cc8b3a171286f141bd /meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | |
parent | e3ada9938ce44f7b25e3040900a553fff8540008 (diff) | |
download | poky-8339c19719092dc8a38c055d90b3a52514a3af15.tar.gz |
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 <peter.kjellerstedt@axis.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/librsvg/librsvg_2.54.5.bb')
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
42 | 42 | ||
43 | inherit rust-target-config | 43 | inherit rust-target-config |
44 | 44 | ||
45 | EXTRA_OECONF:class-target = "--enable-vala" | ||
46 | |||
47 | # rust-cross writes the target linker binary into target json definition without any flags. | 45 | # rust-cross writes the target linker binary into target json definition without any flags. |
48 | # This breaks here because the linker isn't going to work without at least knowing where | 46 | # This breaks here because the linker isn't going to work without at least knowing where |
49 | # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class | 47 | # 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" | |||
58 | CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" | 56 | CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" |
59 | 57 | ||
60 | PACKAGECONFIG ??= "gdkpixbuf" | 58 | PACKAGECONFIG ??= "gdkpixbuf" |
59 | PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vala', '', d)}" | ||
61 | # The gdk-pixbuf loader | 60 | # The gdk-pixbuf loader |
62 | PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" | 61 | PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" |
62 | PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" | ||
63 | 63 | ||
64 | do_install:append() { | 64 | do_install:append() { |
65 | # Loadable modules don't need .a or .la on Linux | 65 | # Loadable modules don't need .a or .la on Linux |