diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2012-08-23 09:13:10 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-24 17:32:55 +0100 |
commit | b9cf3bdb479ce06c788215f2ed8bf38475a62f45 (patch) | |
tree | c31047d885e7bb084a8fdf728c9c0c3ace8ccb2e /meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch | |
parent | 3ea34e035a2cd32e2aa64659c1171dda9d44025d (diff) | |
download | poky-b9cf3bdb479ce06c788215f2ed8bf38475a62f45.tar.gz |
telepathy-glib: update to 0.19.6
The 0001-Fix-a-race-in-_gen-reentrant-methods.list patch is
included in the 0.19.6 version.
(From OE-Core rev: 712c365bf745de3fe927fcc24da505009d17a3e5)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 42 |
1 files changed, 0 insertions, 42 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 deleted file mode 100644 index 4f8ed2be04..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
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 | ||
5 | |||
6 | Very 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 | |||
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 | ||
18 | ensure the ordering. | ||
19 | |||
20 | https://bugs.freedesktop.org/show_bug.cgi?id=52480 | ||
21 | |||
22 | Upstream-Status: Submitted | ||
23 | --- | ||
24 | telepathy-glib/codegen.am | 2 +- | ||
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
26 | |||
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 | ||
39 | @mv $@.tmp $@ | ||
40 | -- | ||
41 | 1.7.10.4 | ||
42 | |||