summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 11:34:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 11:42:27 (GMT)
commit8fdd65f9977e5dc46bba208b9085a0b14ed7098b (patch)
tree0df905332b66dd71fb9e268bed20b6ae12976f57 /meta/recipes-gnome/gtk+
parent21b0a2a5ae059b58ca6ee248e3e4378f48490368 (diff)
downloadpoky-8fdd65f9977e5dc46bba208b9085a0b14ed7098b.tar.gz
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 <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 853c059..9e2523a 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -36,15 +36,11 @@ FILES_${PN}-dbg += " \
36 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ 36 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
37 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" 37 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
38 38
39BASE_RRECOMMENDS = "ttf-dejavu-sans" 39GTKBASE_RRECOMMENDS ?= "liberation-fonts gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
40BASE_RRECOMMENDS_angstrom = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" 40GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
41BASE_RRECOMMENDS_poky = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm shared-mime-info"
42 41
43GLIBC_RRECOMMENDS= "${BASE_RRECOMMENDS} glibc-gconv-iso8859-1" 42RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
44 43RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
45RRECOMMENDS_${PN} = "${BASE_RRECOMMENDS}"
46RRECOMMENDS_${PN}_linux = "${GLIBC_RRECOMMENDS}"
47RRECOMMENDS_${PN}_linux-gnueabi = "${GLIBC_RRECOMMENDS}"
48 44
49do_install () { 45do_install () {
50 autotools_do_install 46 autotools_do_install