| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> |
| 3 | Date: Thu, 17 Oct 2019 12:13:35 +0100 |
| 4 | Subject: [PATCH] meson: build gir even when cross-compiling if introspection |
| 5 | 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 | Fixes #454 and #381. |
| 13 | |
| 14 | Upstream-Status: Backport [35db4a2433fbdf8612cf98b5aab5b14aeb5372f8] |
| 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 90d98d8eb..a47e7f34e 100644 |
| 23 | --- a/meson.build |
| 24 | +++ b/meson.build |
| 25 | @@ -466,7 +466,7 @@ rt_lib = cc.find_library('rt', required : false) |
| 26 | gir = find_program('g-ir-scanner', required : get_option('introspection')) |
| 27 | gnome = import('gnome') |
| 28 | |
| 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 | |
| 32 | gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ |
| 33 | 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \ |
| 34 | -- |
| 35 | 2.17.1 |
| 36 | |