remove libiconv-tiny dependency, use uclibc specific dependency

package/ImageMagick/Makefile

@@ -11,7 +11,7 @@ PKG_MD5SUM:=		8134257e3fbb43cc06fb32a6d725d3d0
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		mm/image
 PKG_DEPENDS:=		libstdcxx
-PKG_BUILDDEP:=		libpng libjpeg-turbo libtiff fontconfig libiconv-tiny
+PKG_BUILDDEP:=		libpng libjpeg-turbo libtiff fontconfig
 PKG_BUILDDEP+=		pango libtool e2fsprogs
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
@@ -19,6 +19,7 @@ PKG_LIBNAME:=		libimagemagick
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 
 PKG_SUBPKGS:=		CONVERT DISPLAY LIBIMAGEMAGICK
 PKGSD_LIBIMAGEMAGICK:=	imagemagick library

package/bitlbee/Makefile

@@ -10,10 +10,11 @@ PKG_MD5SUM:=		4d00c6e09859b653f955b16b988db0ac
 PKG_DESCR:=		irc gateway to im chat networks
 PKG_SECTION:=		app/chat
 PKG_DEPENDS:=		glib libopenssl
-PKG_BUILDDEP:=		glib libiconv-tiny openssl
+PKG_BUILDDEP:=		glib openssl
 PKG_URL:=		http://www.bitlbee.org/
 PKG_SITES:=		http://get.bitlbee.org/src/
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${TOPDIR}/mk/package.mk

package/bogofilter/Makefile

@@ -9,11 +9,12 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		94aee3ced558c2a354547083735f2ba7
 PKG_DESCR:=		mail filter software
 PKG_SECTION:=		net/mail
-PKG_BUILDDEP:=		libiconv-tiny db
+PKG_BUILDDEP:=		db
 PKG_DEPENDS:=		libdb libstdcxx
 PKG_URL:=		http://bogofilter.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${TOPDIR}/mk/package.mk

package/davfs2/Makefile

@@ -10,11 +10,12 @@ PKG_MD5SUM:=		c75f9d7d260e7364362b89beba2b3186
 PKG_DESCR:=		webdav filesystem
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		fuse-utils neon
-PKG_BUILDDEP:=		libiconv-tiny neon fuse
+PKG_BUILDDEP:=		neon fuse
 PKG_URL:=		http://savannah.nongnu.org/projects/davfs2/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/davfs2/
 
 PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 

package/dillo/Makefile

@@ -11,12 +11,13 @@ PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libpng zlib libjpeg-turbo
 PKG_DEPENDS+=		libstdcxx libpthread libopenssl
-PKG_BUILDDEP:=		fltk libXi libiconv-tiny libjpeg-turbo libpng zlib openssl
+PKG_BUILDDEP:=		fltk libXi libjpeg-turbo libpng zlib openssl
 PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 
 PKG_HOST_DEPENDS:=	!cygwin
 PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

package/dosfstools/Makefile

@@ -9,10 +9,11 @@ PKG_RELEASE:=		5
 PKG_MD5SUM:=		45012f5f56f2aae3afcd62120b9e5a08
 PKG_DESCR:=		utilities to create and check FAT filesystems
 PKG_SECTION:=		sys/fs
-PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools/
 PKG_SITES:=		http://daniel-baumann.ch/files/software/dosfstools/
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/fontconfig/Makefile

@@ -10,12 +10,13 @@ PKG_MD5SUM:=		84278204cd7f36adbea7ad8094e039ac
 PKG_DESCR:=		library for configuring and customizing font access
 PKG_SECTION:=		libs/fonts
 PKG_DEPENDS:=		libxml2
-PKG_BUILDDEP:=		freetype libxml2 libiconv-tiny
+PKG_BUILDDEP:=		freetype libxml2
 HOST_BUILDDEP:=		expat-host
 PKG_URL:=		http://fontconfig.org/
 PKG_SITES:=		http://fontconfig.org/release/
 PKG_OPTS:=		dev
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 include ${TOPDIR}/mk/host.mk
@@ -24,7 +25,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-liconv
+HOST_STYLE:=		auto
 CONFIGURE_ARGS+=	--with-arch=${ADK_TARGET_ARCH} \
 			--enable-libxml2 \
 			--disable-docs

package/fuse/Makefile

@@ -10,13 +10,13 @@ PKG_MD5SUM:=		33cae22ca50311446400daf8a6255c6a
 PKG_DESCR:=		filesystem in userspace utility
 PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libfuse
-PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://fuse.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
 PKG_LIBNAME:=		libfuse
 PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 
 PKG_SUBPKGS:=		FUSE_UTILS LIBFUSE
 PKGSD_LIBFUSE:=		filesystem in userspace library

package/gatling/Makefile

@@ -9,10 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a0fb49ccb6b910bdbd7e76a9960394e3
 PKG_DESCR:=		small non-forking webserver
 PKG_SECTION:=		net/http
-PKG_BUILDDEP:=		libowfat libiconv-tiny
+PKG_BUILDDEP:=		libowfat
 PKG_URL:=		http://www.fefe.de/gatling/
 PKG_SITES:=		http://dl.fefe.de/
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk

package/gdb/Makefile

@@ -8,9 +8,11 @@ PKG_NAME:=		gdb
 PKG_DESCR:=		programm debugger
 PKG_SECTION:=		app/debug
 PKG_DEPENDS:=		libthread-db libncurses libexpat zlib
-PKG_BUILDDEP:=		ncurses readline libiconv-tiny expat zlib
+PKG_BUILDDEP:=		ncurses readline expat zlib
 PKG_NOPARALLEL:=	1
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

package/glib/Makefile

@@ -11,13 +11,15 @@ PKG_MD5SUM:=		26d1d08e478fc48c181ca8be44f5b69f
 PKG_DESCR:=		low-level core library that forms the basis of gtk+
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		libpthread
-PKG_BUILDDEP:=		glib-host libffi gettext-tiny libiconv-tiny zlib libelf dbus
-HOST_BUILDDEP:=		libffi-host gettext-tiny-host libiconv-tiny-host python2-host
+PKG_BUILDDEP:=		glib-host libffi gettext-tiny zlib libelf dbus
+HOST_BUILDDEP:=		libffi-host gettext-tiny-host python2-host
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 PKG_NOPARALLEL:=	1
 PKG_OPTS:=		dev noscripts
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+
 include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 

package/gmediaserver/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		media server
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		id3lib libupnp libmagic
-PKG_BUILDDEP:=		id3lib libupnp file libiconv-tiny
+PKG_BUILDDEP:=		id3lib libupnp file
 PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 PKG_CXX:=		GMEDIASERVER
@@ -18,6 +18,7 @@ PKG_CXX:=		GMEDIASERVER
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 
 include ${TOPDIR}/mk/package.mk
 

package/gnupg/Makefile

@@ -10,10 +10,11 @@ PKG_MD5SUM:=		3d46439c5ba304dd2cfc9070a5ce1338
 PKG_DESCR:=		gnu privacy guard
 PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		libreadline
-PKG_BUILDDEP:=		readline libiconv-tiny
+PKG_BUILDDEP:=		readline
 PKG_URL:=		http://www.gnupg.org/
 PKG_SITES:=		ftp://ftp.gnupg.org/gcrypt/gnupg/
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
  
 include ${TOPDIR}/mk/package.mk

package/gnutls/Makefile

@@ -10,13 +10,15 @@ PKG_MD5SUM:=		908dc1e98e28cb1c2c255a71785a4af2
 PKG_DESCR:=		transport layer security library
 PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib libnettle libgmp
-PKG_BUILDDEP:=		libiconv-tiny libgcrypt liblzo libtasn1 
+PKG_BUILDDEP:=		libgcrypt liblzo libtasn1 
 PKG_BUILDDEP+=		zlib ncurses libnettle
 PKG_URL:=		http://www.gnutls.org/
 PKG_SITES:=		ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/
 PKG_LIBNAME:=		libgnutls
 PKG_OPTS:=		dev
 
+PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+
 PKG_SUBPKGS:=		LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
 PKGSD_GNUTLS_UTILS:=	transport layer security utilities
 PKGSS_GNUTLS_UTILS:=	libgnutls libgnutls-extra

package/id3lib/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		19f27ddd2dda4b2d26a559a4f0f402a7
 PKG_DESCR:=		id3 tagging library
 PKG_SECTION:=		libs/audio
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		zlib libiconv-tiny
+PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://id3lib.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=id3lib/}
 PKG_CXX:=		ID3LIB

package/libcdio/Makefile

@@ -9,7 +9,6 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		86f3f2869c1d34e4c6e52db77992b918
 PKG_DESCR:=		library for cd-rom and cd image access
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://www.gnu.org/software/libcdio
 PKG_SITES:=		${MASTER_SITE_GNU:=libcdio/}
 PKG_OPTS:=		dev

package/moc/Makefile

@@ -11,7 +11,7 @@ PKG_DESCR:=		console music player
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		libmad libvorbis libcurl libflac
 PKG_DEPENDS+=		libncurses libid3tag
-PKG_BUILDDEP:=		ncurses libvorbis curl libmad flac libiconv-tiny
+PKG_BUILDDEP:=		ncurses libvorbis curl libmad flac
 PKG_BUILDDEP+=		libid3tag db libtool
 PKG_URL:=		http://moc.daper.net/
 PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/unstable/

package/obexftp/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		f20762061b68bc921e80be4aebc349eb
 PKG_DESCR:=		bluetooth ftp application
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		openobex libobexftp
-PKG_BUILDDEP:=		openobex libiconv-tiny
+PKG_BUILDDEP:=		openobex
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=openobex/}
 PKG_LIBNAME:=		libobexftp

package/openjdk7/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		f6b28633b9978fadc724247cfc264ff0
 PKG_DESCR:=		java virtual machine
 PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
-PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
+PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst
 PKG_BUILDDEP+=		libpng giflib gtk+ glib fontconfig nss
 HOST_BUILDDEP:=		fastjar-host gcj-host ecj-host classpath-host jamvm-host
 HOST_BUILDDEP+=		jikes-host ant-host libXtst-host libXt-host libXinerama-host

package/popt/Makefile

@@ -9,7 +9,6 @@ PKG_RELEASE:=		4
 PKG_MD5SUM:=		3743beefa3dd6247a73f8f7a32c14c33
 PKG_DESCR:=		command line option parsing library
 PKG_SECTION:=		libs/misc
-PKG_BUILDDEP:=		libiconv-tiny
 PKG_URL:=		http://rpm5.org/
 PKG_SITES:=		http://rpm5.org/files/popt/
 PKG_LIBNAME:=		libpopt
@@ -21,8 +20,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-TARGET_LDFLAGS+=	-liconv
-
 libpopt-install:
 	${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib

package/qemu/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		2790f44fd76da5de5024b4aafeb594c2
 PKG_DESCR:=		cpu and system emulator
 PKG_SECTION:=		sys/misc
 PKG_DEPENDS:=		zlib glib
-PKG_BUILDDEP:=		gettext-tiny libiconv-tiny
+PKG_BUILDDEP:=		gettext-tiny
 PKG_BUILDDEP+=		zlib glib
 HOST_BUILDDEP:=		glib-host
 PKG_URL:=		http://wwww.qemu.org/

package/rdesktop/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		f5382c5c85b0d2cc88b9b1aa9bbf1356
 PKG_DESCR:=		client for windows terminal services
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libsamplerate libopenssl alsa-lib libao
-PKG_BUILDDEP:=		libiconv-tiny openssl libsamplerate alsa-lib libao
+PKG_BUILDDEP:=		openssl libsamplerate alsa-lib libao
 PKG_URL:=		http://www.rdesktop.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 

package/subversion/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		17fe81c30fe0f785b2100ebadb3dc580
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		dev/scm
 PKG_DEPENDS:=		zlib apr apr-util libexpat libsqlite neon
-PKG_BUILDDEP:=		apr-util expat apr zlib libiconv-tiny sqlite neon
+PKG_BUILDDEP:=		apr-util expat apr zlib sqlite neon
 PKG_URL:=		http://subversion.apache.org/
 PKG_SITES:=		http://artfiles.org/apache.org/subversion/
 

package/vilistextum/Makefile

@@ -9,7 +9,6 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=            5ba56ffdc56758da716bb46c3e0f517e
 PKG_DESCR:=		html to ascii converter
 PKG_SECTION:=		net/mail
-PKG_BUILDDEP:=		libiconv-tiny
 PKG_SITES:=		http://bhaak.dyndns.org/${PKG_NAME}/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz

package/weechat/Makefile

@@ -10,7 +10,7 @@ PKG_MD5SUM:=		fd584c258aace2aa898f40e1fcf06084
 PKG_DESCR:=		lightweight irc client
 PKG_SECTION:=		app/chat
 PKG_DEPENDS:=		libncurses libgcrypt libz libcurl
-PKG_BUILDDEP:=		ncurses libiconv-tiny autotool libgcrypt
+PKG_BUILDDEP:=		ncurses autotool libgcrypt
 PKG_BUILDDEP+=		zlib curl
 PKG_URL:=		http://www.weechat.org/
 PKG_SITES:=		http://www.weechat.org/files/src/