aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-01-21 19:39:37 +0000
committerMirko Vogt <mirko@openwrt.org>2012-01-21 19:39:37 +0000
commitce751a9279bd8560b86cb516c3a6e90ffc80b8b4 (patch)
treee42160f00f0208c5356f0e2c4fa5114149fc0baf /toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch
parent936dac171ff445b65ff8d91739adf2347e3862b8 (diff)
downloadupstream-ce751a9279bd8560b86cb516c3a6e90ffc80b8b4.tar.gz
upstream-ce751a9279bd8560b86cb516c3a6e90ffc80b8b4.tar.bz2
upstream-ce751a9279bd8560b86cb516c3a6e90ffc80b8b4.zip
[toolchain/eglibc] eglibc 2.14 needs our eglibc patchset as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29842 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch')
-rw-r--r--toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch b/toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch
new file mode 100644
index 0000000000..221eb28709
--- /dev/null
+++ b/toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch
@@ -0,0 +1,27 @@
+--- a/libc/timezone/zic.c
++++ b/libc/timezone/zic.c
+@@ -8,6 +8,8 @@ static char elsieid[] = "@(#)zic.c 8.19"
+ #ifdef CROSS_ZIC
+ #define REPORT_BUGS_TO ""
+ #define PKGVERSION ""
++#undef _
++#define _(X) (X)
+ #else
+ #include "config.h"
+ #endif
+@@ -490,6 +492,7 @@ char * argv[];
+ #ifdef unix
+ (void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
+ #endif /* defined unix */
++#ifndef CROSS_ZIC
+ #if HAVE_GETTEXT
+ (void) setlocale(LC_ALL, "");
+ #ifdef TZ_DOMAINDIR
+@@ -497,6 +500,7 @@ char * argv[];
+ #endif /* defined TEXTDOMAINDIR */
+ (void) textdomain(TZ_DOMAIN);
+ #endif /* HAVE_GETTEXT */
++#endif
+ progname = argv[0];
+ if (TYPE_BIT(zic_t) < 64) {
+ (void) fprintf(stderr, "%s: %s\n", progname,