From deb75e06a5ca89af86856bcefec31f3521701a94 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 12 Jun 2008 14:36:09 +0000 Subject: gtk+.inc: Handle uclibc case correctly git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4627 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/gtk+/gtk+.inc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/gtk+/gtk+.inc b/meta/packages/gtk+/gtk+.inc index ac545f946..32d47a85e 100644 --- a/meta/packages/gtk+/gtk+.inc +++ b/meta/packages/gtk+/gtk+.inc @@ -31,10 +31,15 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_poky = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" +BASE_RRECOMMENDS = "ttf-dejavu-sans" +BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" + +GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1" + +RRECOMMENDS_${PN} = "${BASE_RRECOMMENDS}" +RRECOMMENDS_${PN}_linux = "${GLIBC_RRECOMMENDS}" +RRECOMMENDS_${PN}_linux-gnueabi = "${GLIBC_RRECOMMENDS}" do_stage () { oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} -- cgit v1.2.3