Andrew Geissler | d25ed32 | 2020-06-27 00:28:28 -0500 | [diff] [blame] | 1 | From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 17 Jun 2020 11:43:16 +0200 |
| 4 | Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs |
| 5 | |
| 6 | meson inserts the dependency if the compiler is used directly, but |
| 7 | fails to do so if the compiler is run through a wrapper. This leads |
| 8 | to build race errors between building the compiler and using it. |
| 9 | |
| 10 | Fix provided by Quentin Schulz <quentin.schulz@streamunlimited.com> |
| 11 | |
| 12 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | gir/meson.build | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/gir/meson.build b/gir/meson.build |
| 19 | index b37fdb81..557e5517 100644 |
| 20 | --- a/gir/meson.build |
| 21 | +++ b/gir/meson.build |
| 22 | @@ -448,7 +448,7 @@ foreach gir : gir_files |
| 23 | typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), |
| 24 | input: gir, |
| 25 | output: '@BASENAME@.typelib', |
| 26 | - depends: [gobject_gir, ], |
| 27 | + depends: [gobject_gir, gircompiler, ], |
| 28 | command: gircompiler_command, |
| 29 | install: true, |
| 30 | install_dir: typelibdir, |
| 31 | -- |
| 32 | 2.27.0 |
| 33 | |