remove host-libiconv

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

10 files changed, 9 insertions, 70 deletions

diff --git a/rules/host-gettext.in b/rules/host-gettext.in
index 19d2f1e95..1ede78ea1 100644
--- a/rules/host-gettext.in
+++ b/rules/host-gettext.in
@@ -4,8 +4,6 @@
 config HOST_GETTEXT
 	tristate
 	default ALLYES
-	# for Mac OS
-	select HOST_LIBICONV
 	help
 	  The gettext program translates a natural language
 	  message into the user's language, by looking up
diff --git a/rules/host-gettext.make b/rules/host-gettext.make
index 08d8d9166..9655981c1 100644
--- a/rules/host-gettext.make
+++ b/rules/host-gettext.make
@@ -18,6 +18,12 @@ HOST_PACKAGES-$(PTXCONF_HOST_GETTEXT) += host-gettext
 # Prepare
 # ----------------------------------------------------------------------------
 
+HOST_GETTEXT_CONF_ENV := \
+	$(HOST_ENV) \
+	ac_cv_header_iconv_h=no \
+	am_cv_func_iconv=no \
+	am_cv_lib_iconv=no
+
 #
 # autoconf
 #
diff --git a/rules/host-glib.in b/rules/host-glib.in
index e2c36ef52..570d5eb61 100644
--- a/rules/host-glib.in
+++ b/rules/host-glib.in
@@ -2,11 +2,5 @@
 
 config HOST_GLIB
 	tristate
-	# Note: as there may be systems with and without libiconv and
-	#       glibc-iconv out there, we always use libiconv in our host
-	#       tools. Otherwhise it is not possible to overcome the
-	#       header check in glib.
-	# FIXME what to do if we build a target system without iconv?
-	select HOST_LIBICONV
 	select HOST_ZLIB
 	select HOST_LIBFFI
diff --git a/rules/host-glib.make b/rules/host-glib.make
index 636cddd72..6943c8356 100644
--- a/rules/host-glib.make
+++ b/rules/host-glib.make
@@ -28,10 +28,6 @@ HOST_GLIB_ENV 	:= $(HOST_ENV)
 #
 # autoconf
 #
-# 'iconv' feature: configure tests for this feature in the glibc first. If not
-#                  found it checks for iconv library in the next step. On most
-#                  hosts 'iconv' should be present in the regular host glibc.
-#
 HOST_GLIB_AUTOCONF := \
 	$(HOST_AUTOCONF) \
 	--enable-silent-rules \
@@ -52,8 +48,7 @@ HOST_GLIB_AUTOCONF := \
 	--disable-man \
 	--disable-dtrace \
 	--disable-systemtap \
-	--disable-coverage \
-	--with-libiconv=gnu
+	--disable-coverage
 
 $(STATEDIR)/host-glib.install.post:
 	@$(call targetinfo)
diff --git a/rules/host-libiconv.in b/rules/host-libiconv.in
deleted file mode 100644
index 39267c84d..000000000
--- a/rules/host-libiconv.in
+++ /dev/null
@@ -1,11 +0,0 @@
-## SECTION=hosttools_noprompt
-## SECTION=hosttools_platform
-
-config HOST_LIBICONV
-	tristate
-	default ALLYES
-	help
-	  libiconv converts traditional character encodings
-	  to/from UNICODE. It is for you if your application
-	  needs to support multiple character encodings, but
-	  that support lacks from your system.
diff --git a/rules/host-libiconv.make b/rules/host-libiconv.make
deleted file mode 100644
index a448e55b9..000000000
--- a/rules/host-libiconv.make
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007-2009 by Robert Schwebel <r.schwebel@pengutronix.de>
-#               2009 by Marc Kleine-Budde
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-HOST_PACKAGES-$(PTXCONF_HOST_LIBICONV) += host-libiconv
-
-#
-# Paths and names
-#
-HOST_LIBICONV_VERSION	:= 1.13.1
-HOST_LIBICONV_MD5	:= 7ab33ebd26687c744a37264a330bbe9a
-HOST_LIBICONV		:= libiconv-$(HOST_LIBICONV_VERSION)
-HOST_LIBICONV_SUFFIX	:= tar.gz
-HOST_LIBICONV_URL	:= $(call ptx/mirror, GNU, libiconv/$(HOST_LIBICONV).$(HOST_LIBICONV_SUFFIX))
-HOST_LIBICONV_SOURCE	:= $(SRCDIR)/$(HOST_LIBICONV).$(HOST_LIBICONV_SUFFIX)
-HOST_LIBICONV_DIR	:= $(HOST_BUILDDIR)/$(HOST_LIBICONV)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-HOST_LIBICONV_CONF_TOOL	:= autoconf
-HOST_LIBICONV_CONF_OPT	:= \
-	$(HOST_AUTOCONF) \
-	--disable-static
-
-# vim: syntax=make
diff --git a/rules/host-libxml2.in b/rules/host-libxml2.in
index 3cdcda4d7..a4ed076e5 100644
--- a/rules/host-libxml2.in
+++ b/rules/host-libxml2.in
@@ -3,7 +3,6 @@
 config HOST_LIBXML2
 	tristate
 	select HOST_ZLIB
-	select HOST_LIBICONV
 	default ALLYES
 	help
 	  Libxml2 is a XML C parser and toolkit. XML itself is a
diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
index 130de659b..c4a4b4b1e 100644
--- a/rules/host-libxml2.make
+++ b/rules/host-libxml2.make
@@ -32,6 +32,6 @@ HOST_LIBXML2_ENV 	:= $(HOST_ENV)
 HOST_LIBXML2_AUTOCONF	:= \
 	$(HOST_AUTOCONF) \
 	--disable-static \
-	--with-iconv=yes
+	--without-iconv
 
 # vim: syntax=make
diff --git a/rules/host-pkg-config.in b/rules/host-pkg-config.in
index 2abe61285..c3f0aed81 100644
--- a/rules/host-pkg-config.in
+++ b/rules/host-pkg-config.in
@@ -2,6 +2,5 @@
 
 config HOST_PKG_CONFIG
 	tristate
-	select HOST_LIBICONV
 	default ALLYES
 
diff --git a/rules/host-pkg-config.make b/rules/host-pkg-config.make
index c7a2c0eb9..72d3d12ae 100644
--- a/rules/host-pkg-config.make
+++ b/rules/host-pkg-config.make
@@ -36,7 +36,6 @@ HOST_PKG_CONFIG_CONF_TOOL	:= autoconf
 HOST_PKG_CONFIG_CONF_OPT	:= \
 	$(HOST_AUTOCONF_SYSROOT) \
 	--disable-host-tool \
-	--with-internal-glib \
-	--with-libiconv=gnu
+	--with-internal-glib
 
 # vim: syntax=make