diff options
author | John Crispin <john@openwrt.org> | 2015-03-12 19:50:57 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-03-12 19:50:57 +0000 |
commit | 3e2f57835342074a90843077c1c63c88a42e6217 (patch) | |
tree | 666eb809bad8689d3e992696cd44ea8efa233eda /toolchain/patches/2.15/110-fix_cross_zic.patch | |
parent | eff1859f8e75d7d7cc3d07d2bcb5952ab214b8a0 (diff) | |
download | upstream-3e2f57835342074a90843077c1c63c88a42e6217.tar.gz upstream-3e2f57835342074a90843077c1c63c88a42e6217.tar.bz2 upstream-3e2f57835342074a90843077c1c63c88a42e6217.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>
SVN-Revision: 44701
Diffstat (limited to 'toolchain/patches/2.15/110-fix_cross_zic.patch')
-rw-r--r-- | toolchain/patches/2.15/110-fix_cross_zic.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/toolchain/patches/2.15/110-fix_cross_zic.patch b/toolchain/patches/2.15/110-fix_cross_zic.patch new file mode 100644 index 0000000000..221eb28709 --- /dev/null +++ b/toolchain/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, |