Skip to contentSkip to conversation

Pull request for branch uclibc-iconv-fix

GIT PULL New Thomas Petazzoni 3 participants 9 messages Feb 13, 2010 – Feb 23, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit f0bdacdb5b8fe0fbc276ed510fc58e9a219f5cf8:
Peter Korsgaard (1):

        update for 2010.02-rc1

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot uclibc-iconv-fix

Thomas Petazzoni (1):
Add patch to fix uClibc build failure with locale enabled

 ...libc-0.9.30.2-fix-make-install-host-utils.patch |  153 ++++++++++++++++++++
 1 files changed, 153 insertions(+), 0 deletions(-)
 create mode 100644 toolchain/uClibc/uClibc-0.9.30.2-fix-make-install-host-utils.patch

Thanks,

Signature · 1 line
Thomas Petazzoni
#1 lore raw

PATCH 1/1 Add patch to fix uClibc build failure with locale enabled

This patch fixes the undefined reference to `__iconv_codesets' reported at
http://www.mail-archive.com/uclibc at uclibc.org/msg04970.html. The patch has been taken from the upstream Git repository, and will be part of uClibc 0.9.30.3. In the mean time, let's integrate it.

---
 ...libc-0.9.30.2-fix-make-install-host-utils.patch |  153 ++++++++++++++++++++
 1 files changed, 153 insertions(+), 0 deletions(-)
 create mode 100644 toolchain/uClibc/uClibc-0.9.30.2-fix-make-install-host-utils.patch
toolchain/uClibc/uClibc-0.9.30.2-fix-make-install-host-utils.patch new file +153 -0
new file mode 100644
index 0000000..526dfb1
@@ -0,0 +1,153 @@
+From d75ad2e129b3f22296cead3db53c784527deab60 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <[email protected]>
+Date: Fri, 18 Sep 2009 14:07:31 +0000
+Subject: fix make {,install_}{,host}utils
+
+Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
+---
+diff --git a/extra/locale/programs/locale.c b/extra/locale/programs/locale.c
+index 462a579..dfd2029 100644
+--- a/extra/locale/programs/locale.c
++++ b/extra/locale/programs/locale.c
+@@ -10,10 +10,9 @@
+  *
+  */
+ 
+-
++#include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <string.h>
+ #include <langinfo.h>
+ #include <unistd.h>
+ #ifdef __UCLIBC_HAS_GETOPT_LONG__
+diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
+index 290e680..3ce884d 100644
+--- a/libc/misc/wchar/wchar.c
++++ b/libc/misc/wchar/wchar.c
+@@ -171,7 +171,6 @@ extern size_t _wchar_utf8sntowcs(wchar_t *__restrict pwc, size_t wn,
+ 
+ extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n,
+ 					const wchar_t **__restrict src, size_t wn) attribute_hidden;
+-
+ #endif /* _LIBC */
+ /**********************************************************************/
+ #ifdef L_btowc
+@@ -1201,45 +1200,6 @@ typedef struct {
+ 	int skip_invalid_input;		/* To support iconv -c option. */
+ } _UC_iconv_t;
+ 
+-
+-
+-#ifdef L_iconv
+-
+-#include <iconv.h>
+-#include <string.h>
+-#include <endian.h>
+-#include <byteswap.h>
+-
+-#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN)
+-#error unsupported endianness for iconv
+-#endif
+-
+-#ifndef __CTYPE_HAS_8_BIT_LOCALES
+-#error currently iconv requires 8 bit locales
+-#endif
+-#ifndef __CTYPE_HAS_UTF_8_LOCALES
+-#error currently iconv requires UTF-8 locales
+-#endif
+-
+-
+-enum {
+-	IC_WCHAR_T = 0xe0,
+-	IC_MULTIBYTE = 0xe0,
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-	IC_UCS_4 =	0xec,
+-	IC_UTF_32 = 0xe4,
+-	IC_UCS_2 =	0xe2,
+-	IC_UTF_16 = 0xea,
+-#else
+-	IC_UCS_4 =	0xed,
+-	IC_UTF_32 = 0xe5,
+-	IC_UCS_2 =	0xe3,
+-	IC_UTF_16 = 0xeb,
+-#endif
+-	IC_UTF_8 = 2,
+-	IC_ASCII = 1
+-};
+-
+ /* For the multibyte
+  * bit 0 means swap endian
+  * bit 1 means 2 byte
+@@ -1247,8 +1207,13 @@ enum {
+  *
+  */
+ 
++#if defined L_iconv && defined _LIBC
++/* Used externally only by iconv utility */
+ extern const unsigned char __iconv_codesets[];
+ libc_hidden_proto(__iconv_codesets)
++#endif
++
++#if defined L_iconv || defined L_iconv_main
+ const unsigned char __iconv_codesets[] =
+ 	"\x0a\xe0""WCHAR_T\x00"		/* superset of UCS-4 but platform-endian */
+ #if __BYTE_ORDER == __BIG_ENDIAN
+@@ -1281,7 +1246,48 @@ const unsigned char __iconv_codesets[] =
+ 	"\x08\x02""UTF-8\x00"
+ 	"\x0b\x01""US-ASCII\x00"
+ 	"\x07\x01""ASCII";			/* Must be last! (special case to save a nul) */
++#endif
++#if defined L_iconv && defined _LIBC
+ libc_hidden_data_def(__iconv_codesets)
++#endif
++
++
++#ifdef L_iconv
++
++#include <iconv.h>
++#include <string.h>
++#include <endian.h>
++#include <byteswap.h>
++
++#if (__BYTE_ORDER != __BIG_ENDIAN) && (__BYTE_ORDER != __LITTLE_ENDIAN)
++#error unsupported endianness for iconv
++#endif
++
++#ifndef __CTYPE_HAS_8_BIT_LOCALES
++#error currently iconv requires 8 bit locales
++#endif
++#ifndef __CTYPE_HAS_UTF_8_LOCALES
++#error currently iconv requires UTF-8 locales
++#endif
++
++
++enum {
++	IC_WCHAR_T = 0xe0,
++	IC_MULTIBYTE = 0xe0,
++#if __BYTE_ORDER == __BIG_ENDIAN
++	IC_UCS_4 =	0xec,
++	IC_UTF_32 = 0xe4,
++	IC_UCS_2 =	0xe2,
++	IC_UTF_16 = 0xea,
++#else
++	IC_UCS_4 =	0xed,
++	IC_UTF_32 = 0xe5,
++	IC_UCS_2 =	0xe3,
++	IC_UTF_16 = 0xeb,
++#endif
++	IC_UTF_8 = 2,
++	IC_ASCII = 1
++};
+ 
+ /* Experimentally off - libc_hidden_proto(strcasecmp) */
+ 
+@@ -1575,6 +1581,4 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf,
+ 	}
+ 	return nrcount;
+ }
+-
+ #endif
+-
+--
+cgit v0.8.2.1
Signature · 1 line
1.6.3.3
#2 lore raw

PATCH 1/1 Add patch to fix uClibc build failure with locale enabled

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> This patch fixes the undefined reference to `__iconv_codesets' Thomas> reported at
Thomas> http://www.mail-archive.com/uclibc at uclibc.org/msg04970.html. The patch Thomas> has been taken from the upstream Git repository, and will be part of Thomas> uClibc 0.9.30.3. In the mean time, let's integrate it.

Thanks. Aything else in the stable branch we should take? Bernhard mentioned that the ETA for 0.9.30.3 was ~2 weeks, so we might end up releasing 2010.02 before then.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 Add patch to fix uClibc build failure with locale enabled

Quoted 1 line · On Wed, 17 Feb 2010 11:28:22 +0100 Peter Korsgaard <[email protected]> wrote:

Thanks. Aything else in the stable branch we should take?

I don't know. Reading from the commit messages, some of the commits seem to be relatively important fixes. What's our policy: integrate fixes even if we haven't met the issue ourselves ? integrate all fixes assuming that since they are part of the uClibc stable branch, they should be ok ? I'd vote for the latter.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#4 lore raw

PATCH 1/1 Add patch to fix uClibc build failure with locale enabled

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> On Wed, 17 Feb 2010 11:28:22 +0100

Quoted 1 line · Thomas> Peter Korsgaard <[email protected]> wrote:
Quoted 1 line

Thanks. Aything else in the stable branch we should take?

Thomas> I don't know. Reading from the commit messages, some of the Thomas> commits seem to be relatively important fixes. What's our Thomas> policy: integrate fixes even if we haven't met the issue Thomas> ourselves ? integrate all fixes assuming that since they are Thomas> part of the uClibc stable branch, they should be ok ? I'd vote Thomas> for the latter.

Ok, I've committed everything on the 0_9_30 branch since the 0.9.30.2 release.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/1 Add patch to fix uClibc build failure with locale enabled

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Julien" == Julien Boibessot <[email protected]> writes:

Julien> Hi Peter,
Julien> Peter Korsgaard a ?crit :

Quoted 5 lines
Quoted 5 lines

Thanks. Aything else in the stable branch we should take? Bernhard mentioned that the ETA for 0.9.30.3 was ~2 weeks, so we might end up releasing 2010.02 before then.

Julien> I would recommend to also take this one:
Julien> http://git.uclibc.org/uClibc/commit/?id=779c35b7c4e47d9fc8f69ee582e822a2f6f45411

Hmm, that one isn't on the stable branch and doesn't apply cleanly to it as is. It would be good if you could work with the uclibc guys (E.G. Bernhard) to get it in 0.9.30.3 if needed.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/1 Add patch to fix uClibc build failure with locale enabled

Peter Korsgaard a ?crit :

Quoted 7 lines

Julien> I would recommend to also take this one:
Julien> http://git.uclibc.org/uClibc/commit/?id=779c35b7c4e47d9fc8f69ee582e822a2f6f45411

Hmm, that one isn't on the stable branch and doesn't apply cleanly to it as is. It would be good if you could work with the uclibc guys (E.G. Bernhard) to get it in 0.9.30.3 if needed.

Oups, sorry, I didn't see that 0.9.30 had its own branch and this commit was only on master.

I'll see what I can do but I'm not very aware of the uClibc development process...

Regards,
Julien

#8 lore raw
In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> The following changes since commit f0bdacdb5b8fe0fbc276ed510fc58e9a219f5cf8:
Thomas> Peter Korsgaard (1):
Thomas> update for 2010.02-rc1

Thomas> are available in the git repository at:

Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot uclibc-iconv-fix

Thomas> Thomas Petazzoni (1):
Thomas> Add patch to fix uClibc build failure with locale enabled

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard