From d46dc8bc88e38251bfa3712efe7abf62933f5419 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 24 Mar 2011 01:15:25 +0100 Subject: iconv: Do not include __iconv_codesets into iconv utility Host iconv needs only L_iconv_main defined and __iconv_codesets has to included, as host system does not provide it. Keep __iconv_codesets out of iconv linked against uClibc. Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- utils/Makefile.in | 3 +-- utils/iconv.c | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'utils') diff --git a/utils/Makefile.in b/utils/Makefile.in index bb85be3ce..1714d2866 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -36,8 +36,7 @@ CFLAGS-ldd := $(CFLAGS-utils-shared) -DBUILDING_LINKAGE # Need CFLAGS-utils explicitly, because the source file is not located in utils CFLAGS-iconv := $(CFLAGS-utils) \ $(CFLAGS-utils-shared) \ - -I$(top_srcdir)libc/misc/wchar \ - -DL_iconv_main \ + -I$(top_srcdir)libc/misc/wchar CFLAGS-locale := $(CFLAGS-utils) CFLAGS-getconf :=$(CFLAGS-utils) \ diff --git a/utils/iconv.c b/utils/iconv.c index 04e2c32eb..a0260df93 100644 --- a/utils/iconv.c +++ b/utils/iconv.c @@ -108,7 +108,12 @@ #include #include "wchar.c" /* for _UC_iconv_t and __iconv_codesets */ -extern const unsigned char __iconv_codesets[]; +#ifdef L_iconv_main +static +#else +extern +#endif +const unsigned char __iconv_codesets[]; #define IBUF BUFSIZ #define OBUF BUFSIZ -- cgit v1.2.3