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 <[email protected]>
Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 412c557eb2a92d36d30885f85cc5ff7f372d4bbc..0704096a9162801c5a9c258fdac7b7785867e894 100644 (file)
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -1196,6 +1196,9 @@ libc_hidden_proto(__iconv_codesets)
 #endif
 
 #if defined L_iconv || defined L_iconv_main
+# ifdef L_iconv_main
+static
+# endif
 const unsigned char __iconv_codesets[] =
        "\x0a\xe0""WCHAR_T\x00"         /* superset of UCS-4 but platform-endian */
 #if __BYTE_ORDER == __BIG_ENDIAN

diff --git a/utils/Makefile.in b/utils/Makefile.in
index bb85be3cebe3d417bb80726ef6d013f1efa4a21b..1714d2866c10789513c63c9c07ed2df98ee2f0e8 100644 (file)
--- 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 04e2c32eb1303146edf977d85f17cef327af59c2..a0260df93c0b495755f092988c8e54ff4a4893bd 100644 (file)
--- a/utils/iconv.c
+++ b/utils/iconv.c
@@ -108,7 +108,12 @@
 #include <wchar.h>
 #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