packages/{abiword,gtk}: Do not depend on glibc gconv when compiling for uclibc

    Use the TARGET_OS linux override to RDEPEND/RRECOMMEND glibc-gconv modules. I have
    tested this only on my uclibc build.

diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc
index 8569845..58f712a 100644 (file)
--- a/packages/abiword/abiword.inc
+++ b/packages/abiword/abiword.inc
@@ -3,8 +3,9 @@ HOMEPAGE = "http://www.abiword.org""
 SECTION = "x11/office"
 LICENSE = "GPLv2"
 DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
-RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+RDEPENDS    = "enchant "
+RDEPENDS_linux += "glibc-gconv-ibm850 glibc-gconv-cp1252 \
+                   glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
 PR = "r2"
 
 SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"

diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index 6f90350..7f61029 100644 (file)
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -27,9 +27,11 @@ FILES_${PN}-dbg += " \
         ${libdir}/gtk-2.0/${LIBV}/engines/.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} = " ttf-dejavu-sans"
+RRECOMMENDS_${PN}_angstrom += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
+RRECOMMENDS_${PN}_openzaurus += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
+RRECOMMENDS_${PN}_linux += " glibc-gconv-iso8859-1"
+
 
 EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"