diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-08-21 22:17:25 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-25 17:47:21 +0100 |
| commit | 920334997ffa5c8adebcb2089f31f07e7790902a (patch) | |
| tree | 243743febe3e4e388f515f167b8bf541fb384988 /meta | |
| parent | 1854cd6d37ddfbd8bc0915514b25b0829f86a548 (diff) | |
| download | poky-920334997ffa5c8adebcb2089f31f07e7790902a.tar.gz | |
gettext: Force UTF-8 runtime and skip requiring ISO-8859-1
On musl, there is no real legacy (non-UTF-8) fr_FR locale.
These tests are designed for libcs that ship both fr_FR (ISO-8859-1)
and fr_FR.UTF-8. So the right thing will be to SKIP these tests
Unsetting LOCALE_FR will ensure that it does not enable ISO-8859-1
path, so reset it in run-ptest but thats not enough because it is
being set in the test's own init-env file as well so clear it in that
file as well.
Fixes
Failed ptests:
{'gettext': ['intl-2', 'intl-4', 'intl-thread-3', 'lang-sh', 'lang-bash']}
(From OE-Core rev: 0fe96efea084f4594df43f57e121cb2353bfafa7)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/gettext/gettext_0.23.1.bb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.23.1.bb b/meta/recipes-core/gettext/gettext_0.23.1.bb index e160d4839d..509438c2a7 100644 --- a/meta/recipes-core/gettext/gettext_0.23.1.bb +++ b/meta/recipes-core/gettext/gettext_0.23.1.bb | |||
| @@ -179,6 +179,16 @@ do_install_ptest() { | |||
| 179 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env | 179 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env |
| 180 | } | 180 | } |
| 181 | 181 | ||
| 182 | do_install_ptest:append:libc-musl() { | ||
| 183 | # Force UTF-8 runtime and skip legacy fr_FR subcases | ||
| 184 | sed -i '3i export LANG=fr_FR.UTF-8; export LC_ALL=fr_FR.UTF-8' \ | ||
| 185 | ${D}${PTEST_PATH}/run-ptest | ||
| 186 | sed -i '3i export LOCALE_FR="none"; export LOCALE_FR_UTF8=fr_FR.UTF-8' \ | ||
| 187 | ${D}${PTEST_PATH}/run-ptest | ||
| 188 | sed -i -e 's|^LOCALE_FR="fr_FR.ISO-8859-1"|LOCALE_FR="none"|g' \ | ||
| 189 | ${D}${PTEST_PATH}/tests/init-env | ||
| 190 | } | ||
| 191 | |||
| 182 | RDEPENDS:${PN}-ptest += "coreutils make xz bash gawk autoconf locale-base-de-de locale-base-fr-fr" | 192 | RDEPENDS:${PN}-ptest += "coreutils make xz bash gawk autoconf locale-base-de-de locale-base-fr-fr" |
| 183 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ | 193 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ |
| 184 | glibc-gconv-big5 \ | 194 | glibc-gconv-big5 \ |
