Andrew Geissler | c182c62 | 2020-05-15 14:13:32 -0500 | [diff] [blame^] | 1 | From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 11 May 2020 22:19:16 +0000 |
| 4 | Subject: [PATCH] meson.build: correctly set internal vapi dependencies |
| 5 | |
| 6 | If they are set as strings, meson will supply the right |
| 7 | arguments to vapigen, but will not set the ninja dependencies |
| 8 | to ensure they get built first, and so races will occur: |
| 9 | https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b |
| 10 | |
| 11 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55] |
| 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 13 | --- |
| 14 | gcr/meson.build | 2 +- |
| 15 | ui/meson.build | 4 ++-- |
| 16 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 17 | |
| 18 | diff --git a/gcr/meson.build b/gcr/meson.build |
| 19 | index 254a933..199452f 100644 |
| 20 | --- a/gcr/meson.build |
| 21 | +++ b/gcr/meson.build |
| 22 | @@ -203,7 +203,7 @@ if get_option('introspection') |
| 23 | |
| 24 | gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version), |
| 25 | sources: gcr_gir[0], |
| 26 | - packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ], |
| 27 | + packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ], |
| 28 | metadata_dirs: meson.current_source_dir(), |
| 29 | vapi_dirs: [ |
| 30 | build_root / 'gck', |
| 31 | diff --git a/ui/meson.build b/ui/meson.build |
| 32 | index 5ca3753..477412d 100644 |
| 33 | --- a/ui/meson.build |
| 34 | +++ b/ui/meson.build |
| 35 | @@ -174,8 +174,8 @@ if get_option('introspection') |
| 36 | packages: [ |
| 37 | 'glib-2.0', |
| 38 | 'gio-2.0', |
| 39 | - 'gck-@0@'.format(gck_major_version), |
| 40 | - 'gcr-@0@'.format(gcr_major_version), |
| 41 | + gck_vapi, |
| 42 | + gcr_vapi, |
| 43 | 'gtk+-3.0' |
| 44 | ], |
| 45 | metadata_dirs: meson.current_source_dir(), |