summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/telepathy
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-03-10 01:15:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-11 02:14:24 (GMT)
commit360f082b97ff25b715d0316118ec480f691c6fe0 (patch)
tree11f9c7d12d405d1cfd0c160df81c065eab876584 /meta/recipes-connectivity/telepathy
parent45a51047ebb70aef838dffc1ba4ae63500b5768e (diff)
downloadpoky-360f082b97ff25b715d0316118ec480f691c6fe0.tar.gz
telepathy-python: Fix parallel make issue.
There is a missing dependency (creation of "src/_generated" directory) of some tasks. Add it to fix the parallel make issue. [YOCTO #783] (From OE-Core rev: 184b5c83df9ecdb1891b760155d6a9ce587531ae) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/telepathy')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch40
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb5
2 files changed, 43 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
new file mode 100644
index 0000000..145e17b
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
@@ -0,0 +1,40 @@
1Add dependency of __init__.py
2
3Tasks must be done after exec of __init__, which creates the
4src/_generated directory that tasks are based on.
5
6Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
7
8diff -ruN telepathy-python-0.15.19-orig/src/Makefile.am telepathy-python-0.15.19/src/Makefile.am
9--- telepathy-python-0.15.19-orig/src/Makefile.am 2011-03-10 08:51:49.000000000 +0800
10+++ telepathy-python-0.15.19/src/Makefile.am 2011-03-10 08:54:45.000000000 +0800
11@@ -39,17 +39,17 @@
12 XSLTPROC_OPTS = --nonet --novalid --xinclude
13 tools_dir = $(top_srcdir)/tools
14
15-_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
16+_generated/interfaces.py: _generated/__init__.py $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
17 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
18 $(tools_dir)/python-interfaces-generator.xsl \
19 $(spec_dir)/all.xml
20
21-_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
22+_generated/constants.py: _generated/__init__.py $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
23 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
24 $(tools_dir)/python-constants-generator.xsl \
25 $(spec_dir)/all.xml
26
27-_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
28+_generated/errors.py: _generated/__init__.py $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
29 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
30 $(tools_dir)/python-errors-generator.xsl \
31 $(spec_dir)/all.xml
32@@ -58,7 +58,7 @@
33 $(AM_V_GEN)$(mkdir_p) $(dir $@)
34 @echo "# Placeholder for package" > $@
35
36-_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
37+_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
38 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
39 $(tools_dir)/spec-to-python.xsl \
40 $(spec_dir)/$*.xml
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
index aefde8c..7c83393 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
6 6
7RDEPENDS_${PN} += "python-dbus" 7RDEPENDS_${PN} += "python-dbus"
8 8
9SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz " 9SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \
10 file://parallel_make.patch"
10 11
11PR = "r0" 12PR = "r1"
12 13
13inherit autotools 14inherit autotools
14 15