|
 |
54d1204 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
54d1204 |
From: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
|
|
|
54d1204 |
Date: Sun, 20 Jan 2019 02:09:53 +0100
|
|
|
54d1204 |
Subject: [PATCH] meson: ensure correct build order of VAPI
|
|
|
54d1204 |
|
|
|
54d1204 |
Without this commit spice-client-gtk-3.0.vapi may be built
|
|
|
54d1204 |
before spice-client-glib-2.0.vapi if build_jobs > 1. This causes
|
|
|
54d1204 |
the build to fail because the former depends on the latter
|
|
|
54d1204 |
---
|
|
|
54d1204 |
vapi/meson.build | 5 +++--
|
|
|
54d1204 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
54d1204 |
|
|
|
54d1204 |
diff --git a/vapi/meson.build b/vapi/meson.build
|
|
|
54d1204 |
index 2c4caa0..c9fef3d 100644
|
|
|
54d1204 |
--- a/vapi/meson.build
|
|
|
54d1204 |
+++ b/vapi/meson.build
|
|
|
54d1204 |
@@ -1,12 +1,13 @@
|
|
|
54d1204 |
if spice_gtk_has_vala
|
|
|
54d1204 |
- gnome.generate_vapi('spice-client-glib-2.0',
|
|
|
54d1204 |
+ spice_glib_vapi = gnome.generate_vapi('spice-client-glib-2.0',
|
|
|
54d1204 |
install : true,
|
|
|
54d1204 |
packages : ['gio-2.0', 'gstreamer-1.0'],
|
|
|
54d1204 |
sources : spice_client_glib_gir[0])
|
|
|
54d1204 |
+
|
|
|
54d1204 |
if spice_gtk_has_gtk
|
|
|
54d1204 |
gnome.generate_vapi('spice-client-gtk-3.0',
|
|
|
54d1204 |
install : true,
|
|
|
54d1204 |
- packages : ['gtk+-3.0', 'gstreamer-1.0', 'spice-client-glib-2.0'],
|
|
|
54d1204 |
+ packages : ['gtk+-3.0', 'gstreamer-1.0', spice_glib_vapi],
|
|
|
54d1204 |
gir_dirs : join_paths(meson.build_root(), 'src'),
|
|
|
54d1204 |
vapi_dirs : meson.current_build_dir(),
|
|
|
54d1204 |
sources : spice_client_gtk_gir[0])
|