summaryrefslogtreecommitdiffstats
path: root/rules/glib.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2009-06-09 23:11:42 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2009-06-09 23:11:42 +0000
commite7e42350a5f83f426ca3986a9ec90fb2ce796ea8 (patch)
tree41b65e9a29ebea8af2485ee25588b9c2539b6da8 /rules/glib.make
parent7595a886825031bc18750e9f3bcda9138164c361 (diff)
downloadptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.gz
ptxdist-e7e42350a5f83f426ca3986a9ec90fb2ce796ea8.tar.xz
iconv: rework iconv handling in ptxdist
libiconv provides functionality that is already provided by glibc. So we consolidate ptxdist to use native glibc iconv instead of libiconv support. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10681 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/glib.make')
-rw-r--r--rules/glib.make8
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/glib.make b/rules/glib.make
index 791050ac7..3d05a9550 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -56,9 +56,9 @@ GLIB_ENV := \
#
# autoconf
#
-GLIB_AUTOCONF_LIBICONV-$(PTXCONF_GLIB__LIBICONV_CLIB) += no
-GLIB_AUTOCONF_LIBICONV-$(PTXCONF_GLIB__LIBICONV_GNU) += gnu
-GLIB_AUTOCONF_LIBICONV-$(PTXCONF_GLIB__LIBICONV_NATIVE) += native
+# --with-libiconv=no does also find the libc iconv implementation! So it
+# is the right choice for no locales and locales-via-libc
+#
GLIB_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
@@ -77,7 +77,7 @@ GLIB_AUTOCONF := \
--disable-xattr \
--with-gnu-ld \
--with-pcre=internal \
- --with-libiconv=$(GLIB_AUTOCONF_LIBICONV-y)
+ --with-libiconv=no
# --enable-debug=[no/minimum/yes]
# turn on debugging [default=minimum]