1 From 8ff62dc34961e997fb0224517aef0f12d455a82b Mon Sep 17 00:00:00 2001
2 From: Ross Burton <ross.burton@intel.com>
3 Date: Wed, 25 Jul 2012 12:58:16 +0100
4 Subject: [PATCH] Fix a race in _gen/reentrant-methods.list
6 Very occasionally, a parallel build will fail like this:
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'
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
16 It's doing the mkdir and the subshell in parallel, when the mkdir should be done
17 first. Add an explicit dependency on spec-stamp to reentrant-methods.list to
20 https://bugs.freedesktop.org/show_bug.cgi?id=52480
22 Upstream-Status: Submitted
24 telepathy-glib/codegen.am | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
27 diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
28 index 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
