Patchwork gettext: bump to version 0.18.1.1

login
register
mail settings
Submitter Stefan Fröberg
Date Dec. 14, 2012, 9:01 p.m.
Message ID <50CB93AD.20303@petroprogram.com>
Download mbox | patch
Permalink /patch/206558/
State Not Applicable
Headers show

Comments

Stefan Fröberg - Dec. 14, 2012, 9:01 p.m.
Hello Johan

14.12.2012 20:08, Sagaert Johan kirjoitti:
> Hi
>
> After pulling the latest commits : 
>
> libtool: compile:  /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
> -DLOCALEDIR=\"/usr/share/locale\" -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" -DLIBDIR=\"/usr/lib\" -DBUILDING_LIBINTL -DBUILDING_DLL
> -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/lib\" -DNO_XMALLOC
> -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I.
> -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 -pipe -Os -fvisibility=hidden ./printf.c -o printf.o >/dev/null 2>&1
> ./localename.c: In function '_nl_locale_name_thread_unsafe':
> ./localename.c:2619:31: error: dereferencing pointer to incomplete type
> make[4]: *** [localename.lo] Error 1
> make[4]: *** Waiting for unfinished jobs....
>
> Using uClibc 0.9.33.1 (NTPL)
>
> Regards , Johan
>  
Hmmm...
That sounds familiar. If I remember correctly I hit exactly into same
problem in my own Linux distro
some time ago.

Could you please try the following lil patch ?
(I will include it as an separete attachment here also)

            glibc < 2.12.
            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */

Regards
Stefan


>
> -----Oorspronkelijk bericht-----
> Van: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] Namens Peter Korsgaard
> Verzonden: vrijdag 14 december 2012 12:03
> Aan: Gustavo Zacarias
> CC: buildroot@busybox.net
> Onderwerp: Re: [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
>
>>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
>  Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>
> Committed, thanks.
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index 89a9692..5e86bc4 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
     locale_t thread_locale = uselocale (NULL);
     if (thread_locale != LC_GLOBAL_LOCALE)
       {
-#  if __GLIBC__ >= 2
+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
            glibc < 2.12.
            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
diff --git a/gettext-tools/gnulib-lib/localename.c b/gettext-tools/gnulib-lib/localename.c
index dab5e5b..85149ac 100644
--- a/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-tools/gnulib-lib/localename.c
@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname)
     locale_t thread_locale = uselocale (NULL);
     if (thread_locale != LC_GLOBAL_LOCALE)
       {
-#  if __GLIBC__ >= 2
+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
         /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
            glibc < 2.12.
            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
Stefan Fröberg - Dec. 14, 2012, 9:05 p.m.
Oh sorry, it seems that Gustavo was faster than I providing patch for this
 :)


14.12.2012 23:01, Stefan Fröberg kirjoitti:
> Hello Johan
>
> 14.12.2012 20:08, Sagaert Johan kirjoitti:
>> Hi
>>
>> After pulling the latest commits : 
>>
>> libtool: compile:  /home/buildroot12git/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc -c
>> -DLOCALEDIR=\"/usr/share/locale\" -DLOCALE_ALIAS_PATH=\"/usr/share/locale\" -DLIBDIR=\"/usr/lib\" -DBUILDING_LIBINTL -DBUILDING_DLL
>> -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"/usr/lib\" -DNO_XMALLOC
>> -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I.
>> -I.. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
>> -D_FILE_OFFSET_BITS=64 -pipe -Os -fvisibility=hidden ./printf.c -o printf.o >/dev/null 2>&1
>> ./localename.c: In function '_nl_locale_name_thread_unsafe':
>> ./localename.c:2619:31: error: dereferencing pointer to incomplete type
>> make[4]: *** [localename.lo] Error 1
>> make[4]: *** Waiting for unfinished jobs....
>>
>> Using uClibc 0.9.33.1 (NTPL)
>>
>> Regards , Johan
>>  
> Hmmm...
> That sounds familiar. If I remember correctly I hit exactly into same
> problem in my own Linux distro
> some time ago.
>
> Could you please try the following lil patch ?
> (I will include it as an separete attachment here also)
>
> diff --git a/gettext-runtime/intl/localename.c
> b/gettext-runtime/intl/localename.c
> index 89a9692..5e86bc4 100644
> --- a/gettext-runtime/intl/localename.c
> +++ b/gettext-runtime/intl/localename.c
> @@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const
> char *categoryname)
>      locale_t thread_locale = uselocale (NULL);
>      if (thread_locale != LC_GLOBAL_LOCALE)
>        {
> -#  if __GLIBC__ >= 2
> +#  if __GLIBC__ >= 2 && !defined __UCLIBC__
>          /* Work around an incorrect definition of the _NL_LOCALE_NAME
> macro in
>             glibc < 2.12.
>             See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
> diff --git a/gettext-tools/gnulib-lib/localename.c
> b/gettext-tools/gnulib-lib/localename.c
> index dab5e5b..85149ac 100644
> --- a/gettext-tools/gnulib-lib/localename.c
> +++ b/gettext-tools/gnulib-lib/localename.c
> @@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int category, const
> char *categoryname)
>      locale_t thread_locale = uselocale (NULL);
>      if (thread_locale != LC_GLOBAL_LOCALE)
>        {
> -#  if __GLIBC__ >= 2
> +#  if __GLIBC__ >= 2 && !defined __UCLIBC__
>          /* Work around an incorrect definition of the _NL_LOCALE_NAME
> macro in
>             glibc < 2.12.
>             See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
>
> Regards
> Stefan
>
>
>> -----Oorspronkelijk bericht-----
>> Van: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] Namens Peter Korsgaard
>> Verzonden: vrijdag 14 december 2012 12:03
>> Aan: Gustavo Zacarias
>> CC: buildroot@busybox.net
>> Onderwerp: Re: [Buildroot] [PATCH] gettext: bump to version 0.18.1.1
>>
>>>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
>>  Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>>
>> Committed, thanks.
>>
>> --
>> Bye, Peter Korsgaard
>> _______________________________________________
>> buildroot mailing list
>> buildroot@busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Patch

diff --git a/gettext-runtime/intl/localename.c
b/gettext-runtime/intl/localename.c
index 89a9692..5e86bc4 100644
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -2607,7 +2607,7 @@  gl_locale_name_thread_unsafe (int category, const
char *categoryname)
     locale_t thread_locale = uselocale (NULL);
     if (thread_locale != LC_GLOBAL_LOCALE)
       {
-#  if __GLIBC__ >= 2
+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
         /* Work around an incorrect definition of the _NL_LOCALE_NAME
macro in
            glibc < 2.12.
            See <http://sourceware.org/bugzilla/show_bug.cgi?id=10968>.  */
diff --git a/gettext-tools/gnulib-lib/localename.c
b/gettext-tools/gnulib-lib/localename.c
index dab5e5b..85149ac 100644
--- a/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-tools/gnulib-lib/localename.c
@@ -2607,7 +2607,7 @@  gl_locale_name_thread_unsafe (int category, const
char *categoryname)
     locale_t thread_locale = uselocale (NULL);
     if (thread_locale != LC_GLOBAL_LOCALE)
       {
-#  if __GLIBC__ >= 2
+#  if __GLIBC__ >= 2 && !defined __UCLIBC__
         /* Work around an incorrect definition of the _NL_LOCALE_NAME
macro in