summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch b/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
new file mode 100644
index 0000000000..4f8ed2be04
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
@@ -0,0 +1,42 @@
1From 8ff62dc34961e997fb0224517aef0f12d455a82b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 25 Jul 2012 12:58:16 +0100
4Subject: [PATCH] Fix a race in _gen/reentrant-methods.list
5
6Very occasionally, a parallel build will fail like this:
7
8| Making all in telepathy-glib
9| make[2]: Entering directory `/buildarea1/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/telepathy-glib-0.19.2-r0/telepathy-glib-0.19.2/telepathy-glib'
10| /bin/mkdir -p _gen
11| ( cd . && cat versions/0.7.0.abi [...] versions/0.19.2.abi ) | \
12| /bin/grep '^tp_cli_.*_run_.*' > _gen/reentrant-methods.list.tmp
13| /bin/sh: line 1: _gen/reentrant-methods.list.tmp: No such file or directory
14| make[2]: *** [_gen/reentrant-methods.list] Error 1
15
16It's doing the mkdir and the subshell in parallel, when the mkdir should be done
17first. Add an explicit dependency on spec-stamp to reentrant-methods.list to
18ensure the ordering.
19
20https://bugs.freedesktop.org/show_bug.cgi?id=52480
21
22Upstream-Status: Submitted
23---
24 telepathy-glib/codegen.am | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
28index 26caaef..6ad3ec5 100644
29--- a/telepathy-glib/codegen.am
30+++ b/telepathy-glib/codegen.am
31@@ -149,7 +149,7 @@ _gen/stable-spec.xml: stable-interfaces.xml _gen/stable-stamp $(tools_dir)/xincl
32 # Grab a list of re-entrant tp_cli_*_run_* methods we are committed to
33 # generating for backwards compatibility.
34 # grep --no-filename is not portable :-(
35-_gen/reentrant-methods.list: $(ABI_LISTS) codegen.am
36+_gen/reentrant-methods.list: _gen/spec-stamp $(ABI_LISTS) codegen.am
37 $(AM_V_GEN)( cd $(srcdir) && cat $(ABI_LISTS) ) | \
38 $(GREP) '^tp_cli_.*_run_.*' > $@.tmp
39 @mv $@.tmp $@
40--
411.7.10.4
42