blob: 81c4bdbbcc7e7556ef35dd4cfd160db1c3685fcc [file] [log] [blame]
Andrew Geisslerc926e172021-05-07 16:11:35 -05001From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 23 Apr 2021 16:32:38 +0800
4Subject: [PATCH] gcr/meson.build: fix one parallel build failure
5
6ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing
7dependency, following error occurred intermittently during doing parallel
8build:
9
10 -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c
11../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory
12 32 | #include "gcr/gcr-marshal.h"
13 | ^~~~~~~~~~~~~~~~~~~
14compilation terminated.
15
16Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs]
17
18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19---
20 gcr/meson.build | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/gcr/meson.build b/gcr/meson.build
24index 06c3a63..d9d4b8f 100644
25--- a/gcr/meson.build
26+++ b/gcr/meson.build
27@@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency(
28 sources: [
29 gcr_enums_gen[1],
30 gcr_oids[1],
31+ gcr_marshal_gen[1],
32 ],
33 )
34
35--
362.17.1
37