| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame^] | 1 | From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> |
| 3 | Date: Fri, 18 Oct 2019 00:39:12 +0100 |
| 4 | Subject: [PATCH 1/2] meson: build gir even when cross-compiling if |
| 5 | introspection was enabled explicitly |
| 6 | |
| 7 | This can be made to work in certain circumstances when |
| 8 | cross-compiling, so default to not building g-i stuff |
| 9 | when cross-compiling, but allow it if introspection was |
| 10 | enabled explicitly via -Dintrospection=enabled. |
| 11 | |
| 12 | See gstreamer/gstreamer#454 and gstreamer/gstreamer#381. |
| 13 | |
| 14 | Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19] |
| 15 | |
| 16 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> |
| 17 | --- |
| 18 | meson.build | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/meson.build b/meson.build |
| 22 | index 67aeeb4d0..7b3314bd9 100644 |
| 23 | --- a/meson.build |
| 24 | +++ b/meson.build |
| 25 | @@ -411,7 +411,7 @@ python3 = import('python').find_installation() |
| 26 | |
| 27 | gir = find_program('g-ir-scanner', required : get_option('introspection')) |
| 28 | gnome = import('gnome') |
| 29 | -build_gir = gir.found() and not meson.is_cross_build() |
| 30 | +build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) |
| 31 | gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ |
| 32 | 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ |
| 33 | 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ |
| 34 | -- |
| 35 | 2.17.1 |
| 36 | |