From 8fdd65f9977e5dc46bba208b9085a0b14ed7098b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 May 2011 12:34:30 +0100 Subject: gtk+: Ensure that the default dependencies are ones that exist in OE-Core Also use the glibc override instead of target overrides and remove distro overrides creating variables that can be overridden instead. (From OE-Core rev: ab046b02adc523735ffd61b530130a8c967f9569) Signed-off-by: Richard Purdie Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+.inc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc index 853c05946d..9e2523a200 100644 --- a/meta/recipes-gnome/gtk+/gtk+.inc +++ b/meta/recipes-gnome/gtk+/gtk+.inc @@ -36,15 +36,11 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" -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" +GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info" +GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" -GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1" - -RRECOMMENDS_${PN} = "${BASE_RRECOMMENDS}" -RRECOMMENDS_${PN}_linux = "${GLIBC_RRECOMMENDS}" -RRECOMMENDS_${PN}_linux-gnueabi = "${GLIBC_RRECOMMENDS}" +RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" +RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}" do_install () { autotools_do_install -- cgit v1.2.3-54-g00ecf