From c253969f7e630a6d85e46cadd52f7c5899e34951 Mon Sep 17 00:00:00 2001 From: Yang Yanchao Date: Fri, 24 Dec 2021 17:45:06 +0800 Subject: [PATCH] use setlocale instand of xetlocale in tst-iconv-opt Signed-off-by: Yang Yanchao (cherry picked from commit d979527e30dcb003e11cfd1e020ec030a6e13c99) --- Rewrite-iconv-option-parsing-BZ-19519.patch | 2 +- glibc.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Rewrite-iconv-option-parsing-BZ-19519.patch b/Rewrite-iconv-option-parsing-BZ-19519.patch index 0a88e90..1386e07 100644 --- a/Rewrite-iconv-option-parsing-BZ-19519.patch +++ b/Rewrite-iconv-option-parsing-BZ-19519.patch @@ -836,7 +836,7 @@ index 0000000000..669d812a6a +static int +do_test (void) +{ -+ xsetlocale (LC_ALL, "en_US.UTF-8"); ++ setlocale (LC_ALL, "en_US.UTF-8"); + + + /* 0. iconv_open should gracefully fail for invalid character sets. */ diff --git a/glibc.spec b/glibc.spec index 6cf4518..c0a9968 100644 --- a/glibc.spec +++ b/glibc.spec @@ -59,7 +59,7 @@ ############################################################################## Name: glibc Version: 2.28 -Release: 83 +Release: 84 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -1168,7 +1168,10 @@ fi %doc hesiod/README.hesiod %changelog -* Fri Dec 3 2021 Yang yanchao - 2.28-83 +* Fri Dec 24 2021 Yang yanchao - 2.28-84 +- use setlocale instand of xetlocale in tst-iconv-opt + +* Fri Dec 3 2021 Yang yanchao - 2.28-83 - iconv: revert Add missing brackets Rewrite iconv option parsing [BZ #19519] intl: Handle translation output codesets with suffixes [BZ #26383] -- Gitee