diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-07-09 06:27:26 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-17 10:54:03 +0100 |
commit | 2bea94d98c1c2f8b2ae4559d510e4e770439747c (patch) | |
tree | 1f5e27e367e2f672c15c6cd1408e6279f581e9c3 | |
parent | 6dfb17b48863f8d07c272d27723a24bf7dabf195 (diff) | |
download | poky-2bea94d98c1c2f8b2ae4559d510e4e770439747c.tar.gz |
librsvg: fix build with automake 1.12.x
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
(From OE-Core rev: 2041d00e05ca9260e29b14fb3b640b7594de0102)
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>
-rw-r--r-- | meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index 4e4e33993c..a3e8f0f8ed 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" | |||
11 | DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" | 11 | DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native" |
12 | BBCLASSEXTEND = "native" | 12 | BBCLASSEXTEND = "native" |
13 | 13 | ||
14 | PR = "r5" | 14 | PR = "r6" |
15 | 15 | ||
16 | inherit autotools pkgconfig gnome | 16 | inherit autotools pkgconfig gnome |
17 | 17 | ||
@@ -27,11 +27,6 @@ do_configure_prepend () { | |||
27 | echo "CLEANFILES=" > gtk-doc.make | 27 | echo "CLEANFILES=" > gtk-doc.make |
28 | } | 28 | } |
29 | 29 | ||
30 | do_install_append () { | ||
31 | rmdir ${D}${libdir}/gtk-3.0/engines/ | ||
32 | rmdir ${D}${libdir}/gtk-3.0/ | ||
33 | } | ||
34 | |||
35 | PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" | 30 | PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" |
36 | FILES_${PN} = "${libdir}/*.so.*" | 31 | FILES_${PN} = "${libdir}/*.so.*" |
37 | FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \ | 32 | FILES_${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/*.a ${libdir}/gdk-pixbuf-2.0/*/*/*.a \ |
@@ -65,3 +60,4 @@ fi | |||
65 | test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders | 60 | test -x ${bindir}/gdk-pixbuf-query-loaders && gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders |
66 | test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor | 61 | test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor |
67 | } | 62 | } |
63 | PARALLEL_MAKE = "" | ||