[oe-commits] org.oe.dev packages/{abiword, gtk}: Do not depend on glibc gconv when compiling for uclibc

[freyther commit]

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.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f
Files:
1
packages/abiword/abiword.inc
packages/gtk+/gtk-2.10.inc
Diffs:

#
# mt diff -r2a6d1b343e9a1fe7e1093eca307c4cd6a5b614d8 -r9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f
#
# 
# 
# patch "packages/abiword/abiword.inc"
#  from [8c6f2bc1dbc65be7e43cfd552f49cc21f18aeaf7]
#    to [be29df183cba7aba7e2a695e00d25ffb59a47546]
# 
# patch "packages/gtk+/gtk-2.10.inc"
#  from [38067f4decaf91ef25dcb65bfc6b67248a7c816f]
#    to [5d44e3989048d2ac71a3872d86fbd1bb21b21ce5]
# 
============================================================
--- packages/abiword/abiword.inc	8c6f2bc1dbc65be7e43cfd552f49cc21f18aeaf7
+++ packages/abiword/abiword.inc	be29df183cba7aba7e2a695e00d25ffb59a47546
@@ -1,10 +1,11 @@ DEPENDS     = "perl-native libgsf libgno
 DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
 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"
============================================================
--- packages/gtk+/gtk-2.10.inc	38067f4decaf91ef25dcb65bfc6b67248a7c816f
+++ packages/gtk+/gtk-2.10.inc	5d44e3989048d2ac71a3872d86fbd1bb21b21ce5
@@ -27,10 +27,12 @@ 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"
 
 export GDKTARGET="x11"