diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2016-12-22 17:17:04 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-12-26 11:17:33 +0100 |
commit | 2912f9f2a2e5997df069d38e20d85ff4cc51acef (patch) | |
tree | 783e8cd472936ac1ca9378f16fb3189a486e7a48 /toolchain/musl/patches/005-fix-asctime-day-month-names-not-to-vary-by-locale.patch | |
parent | b97c933ffb5aae338351a1db12a3f7cf5234f5c7 (diff) | |
download | mtk-20170518-2912f9f2a2e5997df069d38e20d85ff4cc51acef.zip mtk-20170518-2912f9f2a2e5997df069d38e20d85ff4cc51acef.tar.gz mtk-20170518-2912f9f2a2e5997df069d38e20d85ff4cc51acef.tar.bz2 |
musl: backport various post-1.1.15 fixes
Backport most important fixes up to latest HEAD
- Taken post-commit reverts/fixes into account
Compile tested
Run-tested on cns3xxx & imx6 targets
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'toolchain/musl/patches/005-fix-asctime-day-month-names-not-to-vary-by-locale.patch')
-rw-r--r-- | toolchain/musl/patches/005-fix-asctime-day-month-names-not-to-vary-by-locale.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/toolchain/musl/patches/005-fix-asctime-day-month-names-not-to-vary-by-locale.patch b/toolchain/musl/patches/005-fix-asctime-day-month-names-not-to-vary-by-locale.patch new file mode 100644 index 0000000..c0e0238 --- /dev/null +++ b/toolchain/musl/patches/005-fix-asctime-day-month-names-not-to-vary-by-locale.patch @@ -0,0 +1,41 @@ +From 6399fa9d29ea83de4735680b77d457bd59606532 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Thu, 7 Jul 2016 16:51:37 -0400 +Subject: fix asctime day/month names not to vary by locale + +the FIXME comment here was overlooked at the time locale support was +added. +--- + src/time/__asctime.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/time/__asctime.c b/src/time/__asctime.c +index e7e7f07..f114dfe 100644 +--- a/src/time/__asctime.c ++++ b/src/time/__asctime.c +@@ -1,17 +1,16 @@ + #include <time.h> + #include <stdio.h> + #include <langinfo.h> ++#include "locale_impl.h" + #include "atomic.h" + +-const char *__nl_langinfo(nl_item); ++const char *__nl_langinfo_l(nl_item, locale_t); + + char *__asctime(const struct tm *restrict tm, char *restrict buf) + { +- /* FIXME: change __nl_langinfo to __nl_langinfo_l with explicit C +- * locale once we have locales */ + if (snprintf(buf, 26, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", +- __nl_langinfo(ABDAY_1+tm->tm_wday), +- __nl_langinfo(ABMON_1+tm->tm_mon), ++ __nl_langinfo_l(ABDAY_1+tm->tm_wday, C_LOCALE), ++ __nl_langinfo_l(ABMON_1+tm->tm_mon, C_LOCALE), + tm->tm_mday, tm->tm_hour, + tm->tm_min, tm->tm_sec, + 1900 + tm->tm_year) >= 26) +-- +cgit v0.11.2 + + |