| From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001 |
| From: Tim Philipp <tim@centricular.com> |
| Date: Thu, 17 Oct 2019 12:13:35 +0100 |
| Subject: [PATCH] meson: build gir even when cross-compiling if introspection |
| was enabled explicitly |
| |
| This can be made to work in certain circumstances when |
| cross-compiling, so default to not building g-i stuff |
| when cross-compiling, but allow it if introspection was |
| enabled explicitly via -Dintrospection=enabled. |
| |
| See gstreamer/gstreamer#454 and gstreamer/gstreamer#381. |
| |
| Upstream commit: 30672ba7d134553e59935ddc875104adba26f25c |
| Signed-off-by: Tim Philipp <tim@centricular.com> |
| Signed-off-by: Adam Duskett <aduskett@gmail.com> |
| --- |
| meson.build | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/meson.build b/meson.build |
| index 264d84c9e..c8147c224 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -371,7 +371,7 @@ endif |
| |
| gir = find_program('g-ir-scanner', required : get_option('introspection')) |
| gnome = import('gnome') |
| -build_gir = gir.found() and not meson.is_cross_build() |
| +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) |
| gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ |
| 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \ |
| 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ |
| -- |
| 2.24.1 |
