Commit 7b6d3689 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

gettext: fix build failure with locale and uclibc 



As reported by Johan Sagaert in the mailing list, if it's building with
a uClibc toolchain with locale enabled the build fails since the new
gettext does a locale hack for glibc which isn't needed nor supported.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 599b9720

package/gettext/gettext-uclibc-compat.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
The glibc fix/hack isn't valid for uClibc.

Patch taken from OpenWRT.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



--- a/gettext-runtime/intl/localename.c

+++ b/gettext-runtime/intl/localename.c

@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego

     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>.  */

--- a/gettext-tools/gnulib-lib/localename.c

+++ b/gettext-tools/gnulib-lib/localename.c

@@ -2607,7 +2607,7 @@ gl_locale_name_thread_unsafe (int catego

     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>.  */