* [PATCH 0/1][PULL] Fix bug 783
@ 2011-03-10 1:19 Dongxiao Xu
2011-03-10 1:19 ` [PATCH 1/1] telepathy-python: Fix parallel make issue Dongxiao Xu
0 siblings, 1 reply; 2+ messages in thread
From: Dongxiao Xu @ 2011-03-10 1:19 UTC (permalink / raw)
To: poky
From: Dongxiao Xu <dongxiao.xu@intel.com>
This pull request fixes [YOCTO #783], which is a parallel make issue of telepathy-python.
Please help to review and pull.
Tested 10 rounds of telepathy-python build with no error occurred.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dxu4/bugfix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/bugfix
Thanks,
Dongxiao Xu <dongxiao.xu@intel.com>
---
Dongxiao Xu (1):
telepathy-python: Fix parallel make issue.
.../telepathy-python-0.15.19/parallel_make.patch | 40 ++++++++++++++++++++
.../telepathy/telepathy-python_0.15.19.bb | 5 +-
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] telepathy-python: Fix parallel make issue.
2011-03-10 1:19 [PATCH 0/1][PULL] Fix bug 783 Dongxiao Xu
@ 2011-03-10 1:19 ` Dongxiao Xu
0 siblings, 0 replies; 2+ messages in thread
From: Dongxiao Xu @ 2011-03-10 1:19 UTC (permalink / raw)
To: poky
From: Dongxiao Xu <dongxiao.xu@intel.com>
There is a missing dependency (creation of "src/_generated" directory)
of some tasks. Add it to fix the parallel make issue.
[YOCTO #783]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../telepathy-python-0.15.19/parallel_make.patch | 40 ++++++++++++++++++++
.../telepathy/telepathy-python_0.15.19.bb | 5 +-
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
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 @@
+Add dependency of __init__.py
+
+Tasks must be done after exec of __init__, which creates the
+src/_generated directory that tasks are based on.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+diff -ruN telepathy-python-0.15.19-orig/src/Makefile.am telepathy-python-0.15.19/src/Makefile.am
+--- telepathy-python-0.15.19-orig/src/Makefile.am 2011-03-10 08:51:49.000000000 +0800
++++ telepathy-python-0.15.19/src/Makefile.am 2011-03-10 08:54:45.000000000 +0800
+@@ -39,17 +39,17 @@
+ XSLTPROC_OPTS = --nonet --novalid --xinclude
+ tools_dir = $(top_srcdir)/tools
+
+-_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
++_generated/interfaces.py: _generated/__init__.py $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/python-interfaces-generator.xsl \
+ $(spec_dir)/all.xml
+
+-_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
++_generated/constants.py: _generated/__init__.py $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/python-constants-generator.xsl \
+ $(spec_dir)/all.xml
+
+-_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
++_generated/errors.py: _generated/__init__.py $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/python-errors-generator.xsl \
+ $(spec_dir)/all.xml
+@@ -58,7 +58,7 @@
+ $(AM_V_GEN)$(mkdir_p) $(dir $@)
+ @echo "# Placeholder for package" > $@
+
+-_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
++_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/spec-to-python.xsl \
+ $(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 \
RDEPENDS_${PN} += "python-dbus"
-SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz "
+SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \
+ file://parallel_make.patch"
-PR = "r0"
+PR = "r1"
inherit autotools
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-10 1:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-10 1:19 [PATCH 0/1][PULL] Fix bug 783 Dongxiao Xu
2011-03-10 1:19 ` [PATCH 1/1] telepathy-python: Fix parallel make issue Dongxiao Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox