summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-10 12:49:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 14:13:37 (GMT)
commited9bb94f352945d0aef2dd25e03bdc7e2bdeab25 (patch)
tree4adfdeb036fc210a5a7e8099db97a0c8097a1768 /meta/recipes-connectivity
parent13221b222b71fc8afdae819056aea85457a9e02e (diff)
downloadpoky-ed9bb94f352945d0aef2dd25e03bdc7e2bdeab25.tar.gz
telepathy-idle: fix parallel build
Apply a patch from upstream git, and clean up our other patch so that it applies. [ YOCTO #3056 ] (From OE-Core rev: b0d23a1e3335ccd9bdc5b6512020ff3321619abf) Signed-off-by: Ross Burton <ross.burton@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-idle-0.1.12/build-fix-for-make-j-safety.patch39
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch24
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb5
3 files changed, 43 insertions, 25 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 0000000..0aeed09
--- /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
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
index a5efed4..2cd2c78 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
@@ -3,7 +3,7 @@ Upstream-Status: Pending
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 3Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4--- a/extensions/Makefile.am 4--- a/extensions/Makefile.am
5+++ b/extensions/Makefile.am 5+++ b/extensions/Makefile.am
6@@ -37,12 +37,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi 6@@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
7 --xinclude $(tools_dir)/identity.xsl \ 7 --xinclude $(tools_dir)/identity.xsl \
8 $< > $@ 8 $< > $@
9 9
@@ -13,25 +13,3 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
13 $(tools_dir)/doc-generator.xsl \ 13 $(tools_dir)/doc-generator.xsl \
14 $< > $@ 14 $< > $@
15 15
16-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
17+_gen/svc.c _gen/svc.h: _gen/all.xml \
18 $(tools_dir)/glib-ginterface-gen.py
19 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
20 --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
21--- a/extensions/Makefile.in
22+++ b/extensions/Makefile.in
23@@ -585,12 +585,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
24 --xinclude $(tools_dir)/identity.xsl \
25 $< > $@
26
27-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
28+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
29 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
30 $(tools_dir)/doc-generator.xsl \
31 $< > $@
32
33-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
34+_gen/svc.c _gen/svc.h: _gen/all.xml \
35 $(tools_dir)/glib-ginterface-gen.py
36 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
37 --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
index c8163e2..c9e8b3b 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
@@ -5,10 +5,11 @@ DEPENDS = "glib-2.0 dbus telepathy-glib openssl"
5LICENSE = "LGPLv2.1" 5LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9" 7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
8PR = "r0" 8PR = "r1"
9 9
10SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ 10SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
11 file://fix-svc-gtk-doc.h-target.patch" 11 file://fix-svc-gtk-doc.h-target.patch \
12 file://build-fix-for-make-j-safety.patch"
12 13
13SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366" 14SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366"
14SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b" 15SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b"