diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-10 02:29:38 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:54:05 +0100 |
commit | a41f09546d26219dea589dfdff1bba07b1108edf (patch) | |
tree | 153c994a33a1332cbae9258446ce57be0ff3acd9 /meta | |
parent | d434cb6e9694638e7cb09862f4a3f22f073ff89d (diff) | |
download | poky-a41f09546d26219dea589dfdff1bba07b1108edf.tar.gz |
telepathy-python: fix build with automake 1.12
Added a new patch:
telepathy-python_fix_for_automake_1.12.patch
More comments in the patch header.
(From OE-Core rev: aa3032aef2af5a91c1af77b9323fe762b055cd93)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch | 26 | ||||
-rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb | 5 |
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch new file mode 100644 index 0000000000..f613fdce4d --- /dev/null +++ b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has deprecated use of mkdir_p, and it recommends | ||
4 | use of MKDIR_P instead. Changed the code to avoid these kind | ||
5 | of warning-errors. | ||
6 | |||
7 | | make[1]: _generated/: Command not found | ||
8 | | make[1]: *** [_generated/__init__.py] Error 127 | ||
9 | | make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src' | ||
10 | | make: *** [all-recursive] Error 1 | ||
11 | |||
12 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
13 | 2012/07/10 | ||
14 | Index: telepathy-python-0.15.19/src/Makefile.am | ||
15 | =================================================================== | ||
16 | --- telepathy-python-0.15.19.orig/src/Makefile.am | ||
17 | +++ telepathy-python-0.15.19/src/Makefile.am | ||
18 | @@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_ | ||
19 | $(spec_dir)/all.xml | ||
20 | |||
21 | _generated/__init__.py: | ||
22 | - $(AM_V_GEN)$(mkdir_p) $(dir $@) | ||
23 | + $(AM_V_GEN)$(MKDIR_P) $(dir $@) | ||
24 | @echo "# Placeholder for package" > $@ | ||
25 | |||
26 | _generated/%.py: _generated/__init__.py $(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 0113854d96..383e29ab10 100644 --- a/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb +++ b/meta/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb | |||
@@ -8,9 +8,10 @@ RDEPENDS_${PN} += "python-dbus" | |||
8 | 8 | ||
9 | SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ | 9 | SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ |
10 | file://parallel_make.patch \ | 10 | file://parallel_make.patch \ |
11 | file://remove_duplicate_install.patch" | 11 | file://remove_duplicate_install.patch \ |
12 | file://telepathy-python_fix_for_automake_1.12.patch" | ||
12 | 13 | ||
13 | PR = "r4" | 14 | PR = "r5" |
14 | 15 | ||
15 | inherit autotools | 16 | inherit autotools |
16 | 17 | ||