diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | localedata/gen-locale.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 1598052abe..a84f970761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2017-11-22 Joseph Myers <joseph@codesourcery.com> + * localedata/gen-locale.sh: Fix typo in variable name. + * resolv/res_debug.c (p_secstodate): Condition definition on [SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27)]. Define directly as __p_secstodate, and as a compat symbol. Do not use diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index 757a0e9321..39f1475cbc 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -69,7 +69,7 @@ fi # warning. See localedata/Makefile $(INSTALL-SUPPORTED-LOCALES) # for the same logic. if [ "$charmap_real" = 'SHIFT_JIS' ] \ - || [ "$charmpa_real" = 'SHIFT_JISX0213' ]; then + || [ "$charmap_real" = 'SHIFT_JISX0213' ]; then flags="$flags --no-warnings=ascii" fi |