summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
new file mode 100644
index 0000000000..0aeed09c40
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
@@ -0,0 +1,39 @@
1From b092172e56393fad70e472afa26df4f886dfdbc0 Mon Sep 17 00:00:00 2001
2From: Dan Winship <danw@gnome.org>
3Date: Fri, 24 Aug 2012 12:19:45 -0400
4Subject: [PATCH] build: fix for "make -j" safety
5
6A make rule with multiple (non-pattern) targets just says that each of
7those files can be built by the rule, not that the rule builds all of
8them at once. So under "make -j", extensions/Makefile would run three
9copies of glib-ginterface-gen.py at once, which could end up deleting
10each others' files and causing a make failure. Fix.
11
12Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
13
14Upstream-Status: Backport [b092172e56393fad70e472afa26df4f886dfdbc0]
15Signed-off-by: Ross Burton <ross.burton@intel.com>
16
17---
18 extensions/Makefile.am | 5 ++++-
19 1 file changed, 4 insertions(+), 1 deletion(-)
20
21diff --git a/extensions/Makefile.am b/extensions/Makefile.am
22index 24efb6e..bb837da 100644
23--- a/extensions/Makefile.am
24+++ b/extensions/Makefile.am
25@@ -42,7 +42,10 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
26 $(tools_dir)/doc-generator.xsl \
27 $< > $@
28
29-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
30+_gen/svc.h: _gen/svc.c
31+_gen/svc-gtk-doc.h: _gen/svc.c
32+
33+_gen/svc.c: _gen/all.xml \
34 $(tools_dir)/glib-ginterface-gen.py
35 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
36 --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
37--
381.7.10.4
39