From a42a5c30175b3387703859644c5b8d330915b231 Mon Sep 17 00:00:00 2001 From: blogic Date: Tue, 28 Oct 2008 16:31:38 +0000 Subject: [PATCH] Patch to make gettext usable when uClibc is compiled without locale support.This patch unlocks the functions of gettext to work on systems without locale support. On an default OpenWrt the uClibc is compiled with only a dummy support for locale, which is unusable and makes so the gettext library completely unusable on this systems. git-svn-id: svn://svn.openwrt.org/openwrt/packages@13057 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/gettext/Makefile | 2 +- libs/gettext/patches/120-uclibc-nolocale.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 libs/gettext/patches/120-uclibc-nolocale.patch diff --git a/libs/gettext/Makefile b/libs/gettext/Makefile index c01303fe3..3686c3168 100644 --- a/libs/gettext/Makefile +++ b/libs/gettext/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gettext PKG_VERSION:=0.16.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gettext diff --git a/libs/gettext/patches/120-uclibc-nolocale.patch b/libs/gettext/patches/120-uclibc-nolocale.patch new file mode 100644 index 000000000..2259dcd05 --- /dev/null +++ b/libs/gettext/patches/120-uclibc-nolocale.patch @@ -0,0 +1,13 @@ +Index: gettext-0.16.1/gettext-runtime/intl/localename.c +=================================================================== +--- gettext-0.16.1.orig/gettext-runtime/intl/localename.c 2007-12-29 22:51:09.363903016 +0100 ++++ gettext-0.16.1/gettext-runtime/intl/localename.c 2008-10-26 16:57:14.048169957 +0100 +@@ -988,7 +988,7 @@ + { + /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. + On some systems this can be done by the 'setlocale' function itself. */ +-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL ++#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL && (!defined __UCLIBC__ || defined __UCLIBC_HAS_LOCALE__) + return setlocale (category, NULL); + #else + const char *retval; -- 2.11.0