git.libre-soc.org Git - buildroot.git/blob

   1 From 35db4a2433fbdf8612cf98b5aab5b14aeb5372f8 Mon Sep 17 00:00:00 2001
   2 From: Tim Philipp <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 See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
  13
  14 Upstream commit: 30672ba7d134553e59935ddc875104adba26f25c
  15 Signed-off-by: Tim Philipp <tim@centricular.com>
  16 Signed-off-by: Adam Duskett <aduskett@gmail.com>
  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 264d84c9e..c8147c224 100644
  23 --- a/meson.build
  24 +++ b/meson.build
  25 @@ -371,7 +371,7 @@ endif
  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_DISABLE", "yes", TRUE);' + \
  33      'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
  34 --
  35 2.24.1