aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/glibc/patches/2.15/110-fix_cross_zic.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-03-12 19:50:57 +0000
committerJohn Crispin <blogic@openwrt.org>2015-03-12 19:50:57 +0000
commitd5f527f3cee5cec5744d2a6f3ccd2cdae7adaca8 (patch)
tree5236aa6a2ac180eacc86c1739a57f41619119077 /toolchain/glibc/patches/2.15/110-fix_cross_zic.patch
parenta00f7e5cb5fbb3dd1486a3623d2b3428a6b07a79 (diff)
downloadmaster-187ad058-d5f527f3cee5cec5744d2a6f3ccd2cdae7adaca8.tar.gz
master-187ad058-d5f527f3cee5cec5744d2a6f3ccd2cdae7adaca8.tar.bz2
master-187ad058-d5f527f3cee5cec5744d2a6f3ccd2cdae7adaca8.zip
toolchain: The glorious return of glibc, ver 2.21
It's the eglibc packaging with a bit of spit-polishing. And testing. :-) [blogic: merged glibc and eglibc into 1 and made eglibc a glibc variant] Signed-off-by: Jeff Waugh <jdub@bethesignal.org> Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44701 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/glibc/patches/2.15/110-fix_cross_zic.patch')
-rw-r--r--toolchain/glibc/patches/2.15/110-fix_cross_zic.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/toolchain/glibc/patches/2.15/110-fix_cross_zic.patch b/toolchain/glibc/patches/2.15/110-fix_cross_zic.patch
new file mode 100644
index 0000000000..221eb28709
--- /dev/null
+++ b/toolchain/glibc/patches/2.15/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,