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

gettext: bump to version 0.18.2 



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

package/gettext/gettext-uclibc-compat.patch

deleted100644 → 0
+0 −27
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>.  */

package/gettext/gettext-uclibc-sched_param-def.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc

and is not needed too per standard. gnulib attempts to use it but we have to account

for it because in this case uclibc does not behave like glibc.



-Khem



http://bugs.gentoo.org/336484

http://bugs.gentoo.org/323377



--- gettext/gettext-tools/gnulib-lib/spawn.in.h

+++ gettext/gettext-tools/gnulib-lib/spawn.in.h

@@ -31,7 +31,7 @@

 

 /* Get definitions of 'struct sched_param' and 'sigset_t'.

    But avoid namespace pollution on glibc systems.  */

-#ifndef __GLIBC__

+#if !defined __GLIBC__ || defined __UCLIBC__

 # include <sched.h>

 # include <signal.h>

 #endif

package/gettext/gettext.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

#############################################################



GETTEXT_VERSION = 0.18.1.1

GETTEXT_VERSION = 0.18.2

GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext

GETTEXT_INSTALL_STAGING = YES

GETTEXT_LICENSE = GPLv2+