summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-07 08:18:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-07 21:54:16 (GMT)
commit84760050ab5b2fc185782b05ef5b746fffad2e0c (patch)
tree77c58ff6ae275212a25b0842e04d31aef82bad5c /meta/recipes-connectivity/telepathy/telepathy-python-0.15.19
parent4669760ac14bd28c5cfa554b8d5a9d82a26e0f52 (diff)
downloadpoky-84760050ab5b2fc185782b05ef5b746fffad2e0c.tar.gz
telepathy-python: avoid duplicated installation of errors.py
telepathy-python install fails on latest Fedora 16 due to the tighter check of duplicated file installation. Remove one errors.py entry in Makefile.am to fix this issue. [YOCTO #1453] (From OE-Core rev: d84fd7c1e90f080ea0c702cba9a9f81a2c465ee6) 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/telepathy-python-0.15.19')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
new file mode 100644
index 0000000..df95a4c
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
@@ -0,0 +1,26 @@
1commit f6c67662145de889055a86a6b3b12c70a45fc8d5
2Author: Dongxiao Xu <dongxiao.xu@intel.com>
3Date: Wed Sep 7 16:02:20 2011 +0800
4
5 Avoid duplicated installation of errors.py
6
7 newer version of autotools don't seem to like listing files to install
8 twice. Remove one errors.py from the installation list.
9
10 Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
11
12 Upstream-Status: Inappropirate [upstream inactive]
13
14diff --git a/src/Makefile.am b/src/Makefile.am
15index 5c27dfe..7536e43 100644
16--- a/src/Makefile.am
17+++ b/src/Makefile.am
18@@ -11,7 +11,7 @@ telepathy_PYTHON = \
19
20 # telepathy._generated.* auto-generated modules
21 spec_dir = $(top_srcdir)/spec
22-spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
23+spec_files := $(filter-out _generated/errors.py, $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)))
24
25 BUILT_SOURCES = \
26 _generated/interfaces.py \