From aa3032aef2af5a91c1af77b9323fe762b055cd93 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 10 Jul 2012 02:29:38 -0700 Subject: 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. Signed-off-by: Nitin A Kamble Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../telepathy-python_fix_for_automake_1.12.patch | 26 ++++++++++++++++++++++ .../telepathy/telepathy-python_0.15.19.bb | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch (limited to 'meta/recipes-connectivity') 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 @@ +Upstream-Status: Pending + +automake 1.12 has deprecated use of mkdir_p, and it recommends +use of MKDIR_P instead. Changed the code to avoid these kind +of warning-errors. + +| make[1]: _generated/: Command not found +| make[1]: *** [_generated/__init__.py] Error 127 +| 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' +| make: *** [all-recursive] Error 1 + +Signed-Off-By: Nitin A Kamble +2012/07/10 +Index: telepathy-python-0.15.19/src/Makefile.am +=================================================================== +--- telepathy-python-0.15.19.orig/src/Makefile.am ++++ telepathy-python-0.15.19/src/Makefile.am +@@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_ + $(spec_dir)/all.xml + + _generated/__init__.py: +- $(AM_V_GEN)$(mkdir_p) $(dir $@) ++ $(AM_V_GEN)$(MKDIR_P) $(dir $@) + @echo "# Placeholder for package" > $@ + + _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" SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://parallel_make.patch \ - file://remove_duplicate_install.patch" + file://remove_duplicate_install.patch \ + file://telepathy-python_fix_for_automake_1.12.patch" -PR = "r4" +PR = "r5" inherit autotools -- cgit v1.2.3