summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch b/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
new file mode 100644
index 0000000..720ea6c
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/gio-test-race.patch
@@ -0,0 +1,54 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From a047a0270ee5faf1d9d6080cbc613defdf52baea Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 4 Feb 2014 13:15:08 +0000
7Subject: [PATCH] gio/tests: fix race when generating code
8
9There is a race condition in the makefile that can result in build failures like this in parallel builds:
10
11| ./gdbus-test-codegen-generated.h:7:0: error: unterminated #ifndef
12| #ifndef __GDBUS_TEST_CODEGEN_GENERATED_H__
13
14This is because a rule like this:
15
16x.c x.h: prerequisites
17 @commands
18
19doesn't consider x.c and x.h together. Instead, it expands to two rules, one to
20generate x.c and one to generate x.h, which happen to run the same commands. In
21the worst case they execute in parallel, overwriting each other's output.
22
23Signed-off-by: Ross Burton <ross.burton@intel.com>
24
25https://bugzilla.gnome.org/show_bug.cgi?id=723616
26---
27 gio/tests/Makefile.am | 4 +++-
28 1 file changed, 3 insertions(+), 1 deletion(-)
29
30diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
31index 0beb239..270faf6 100644
32--- a/gio/tests/Makefile.am
33+++ b/gio/tests/Makefile.am
34@@ -436,7 +436,7 @@ gmenumodel_SOURCES = $(gdbus_sessionbus_sources) gmenumode
35 gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotification.c gnotification-server.h gnotification-server.c
36
37 gdbus-test-codegen.o: gdbus-test-codegen-generated.h
38-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
39+gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
40 $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
41 UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
42 $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
43@@ -455,6 +455,8 @@ gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c: test-codegen.xml
44 --annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
45 $(srcdir)/test-codegen.xml \
46 $(NULL)
47+gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h
48+ @: # Generated as side-effect of .h
49
50 EXTRA_DIST += test-codegen.xml
51 CLEANFILES += gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml
52--
531.7.10.4
54