summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-25 12:21:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 13:55:21 (GMT)
commit04ba76b0623623289e60858cf1344f16672d2b7c (patch)
tree3f014fcdb773817b1c74bdc7adb81027b42a8688 /meta/recipes-connectivity
parent11c1f9417125022d918a3b87c566766c7947028e (diff)
downloadpoky-04ba76b0623623289e60858cf1344f16672d2b7c.tar.gz
telepathy-glib: fix a build race
[YOCTO #2462] (From OE-Core rev: e1e3107892c843e57261a2579e2c268dd850434d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch42
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb5
2 files changed, 45 insertions, 2 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 0000000..4f8ed2b
--- /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
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
index deba3bb..9dbc5be 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" 3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib" 4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6PR = "r0" 6PR = "r1"
7 7
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz" 8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \
9 file://0001-Fix-a-race-in-_gen-reentrant-methods.list.patch"
9 10
10SRC_URI[md5sum] = "af2b33c1215f189e637bd59cc9139255" 11SRC_URI[md5sum] = "af2b33c1215f189e637bd59cc9139255"
11SRC_URI[sha256sum] = "7e3c313ed08e26339deb603a615cec62a370131075514439f79f473f92ab84c3" 12SRC_URI[sha256sum] = "7e3c313ed08e26339deb603a615cec62a370131075514439f79f473f92ab84c3"