| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex@linutronix.de> |
| 3 | Date: Mon, 2 Jan 2023 15:00:02 +0100 |
| 4 | Subject: [PATCH] meson.build: build introspection according to option only |
| 5 | |
| 6 | The way the check is written, if the build is native, then the |
| 7 | introspection option has no effect. |
| 8 | |
| 9 | Particularly yocto project does want to disable introspection in |
| 10 | native builds and enable it in cross builds (both via the option), |
| 11 | and without this patch the former is not possible. |
| 12 | |
| 13 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5382] |
| 14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 15 | --- |
| 16 | meson.build | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/meson.build b/meson.build |
| 20 | index bfc33af0f6..94ffaa7769 100644 |
| 21 | --- a/meson.build |
| 22 | +++ b/meson.build |
| 23 | @@ -854,7 +854,7 @@ endif |
| 24 | |
| 25 | # Introspection |
| 26 | gir = find_program('g-ir-scanner', required : get_option('introspection')) |
| 27 | -build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) |
| 28 | +build_gir = gir.found() and get_option('introspection') |
| 29 | |
| 30 | subdir('gdk') |
| 31 | subdir('gtk') |
| 32 | -- |
| 33 | 2.30.2 |
| 34 | |