| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From 179102310e9a3729fb5b00f2a7bf24b12f4a7a83 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Sat, 16 Apr 2022 20:04:14 +0200 |
| 4 | Subject: [PATCH] Allow building gir in cross environments |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | For us this works perfectly fine |
| 10 | |
| 11 | Upstream-Status: Inappropriate [OE-specific] |
| 12 | |
| 13 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 14 | Signed-off-by: Markus Volk <f_l_k@t-online.de> |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 15 | |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 16 | --- a/meson.build 2022-09-18 14:48:53.000000000 +0200 |
| 17 | +++ b/meson.build 2022-11-26 14:05:13.302487232 +0100 |
| 18 | @@ -51,7 +51,7 @@ |
| 19 | gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py') |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 20 | |
| 21 | g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) |
| 22 | -build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() |
| 23 | +build_gir = get_option('introspection') and g_ir_scanner.found() |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 24 | build_docs = get_option('gtk_doc') and build_gir |
| Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 25 | |
| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 26 | schemas_srcdir = meson.project_source_root() / 'schemas' |