Patchwork [07/15] librsvg: fix build with automake 1.12.x

login
register
mail settings
Submitter Nitin A Kamble
Date July 9, 2012, 4:26 p.m.
Message ID <09f17835439aabc618affdb410b49c80d12423e1.1341850982.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/31525/
State Accepted
Commit 2041d00e05ca9260e29b14fb3b640b7594de0102
Headers show

Comments

Nitin A Kamble - July 9, 2012, 4:26 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

automake 1.12.x automatically deletes empty directories, so
the additional rmdir from the do_install_append fails.

cleanup the do_install_append for automake 1.12.x

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-gnome/librsvg/librsvg_2.32.1.bb |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

Patch

diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 4e4e339..a3e8f0f 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -11,7 +11,7 @@  DEPENDS = "gtk+ libcroco cairo libxml2 popt"
 DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native"
 BBCLASSEXTEND = "native"
 
-PR = "r5"
+PR = "r6"
 
 inherit autotools pkgconfig gnome
 
@@ -27,11 +27,6 @@  do_configure_prepend () {
 	echo "CLEANFILES=" > gtk-doc.make
 }
 
-do_install_append () {
-	rmdir ${D}${libdir}/gtk-3.0/engines/
-	rmdir ${D}${libdir}/gtk-3.0/
-}
-
 PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \
@@ -65,3 +60,4 @@  fi
 test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
 test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache  -q ${datadir}/icons/hicolor
 }
+PARALLEL_MAKE = ""