diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 12:34:30 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-18 12:42:03 +0100 |
| commit | ab046b02adc523735ffd61b530130a8c967f9569 (patch) | |
| tree | a9c7dc900fb60174686d005fc30cc4e1a8aca204 /meta | |
| parent | 1e76c3c4c4164e884b5c474fa279a1f2f7e846f5 (diff) | |
| download | openembedded-core-contrib-ab046b02adc523735ffd61b530130a8c967f9569.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+.inc | 12 |
1 files changed, 4 insertions, 8 deletions
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 |