Skip to contentSkip to conversation

m4: Add locale-base-fr-fr rdep for musl too

PATCH New Khem Raj 1 participant 2 messages Apr 21, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 m4: Add locale-base-fr-fr rdep for musl too

---
 meta/recipes-devtools/m4/m4-1.4.19.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/m4/m4-1.4.19.inc +2 -2
index 3b4303b7fd..0dd273bd89 100644
@@ -53,9 +53,9 @@ do_install_ptest() {
 }
 
 
-RDEPENDS:${PN}-ptest += "make coreutils diffutils bash"
+RDEPENDS:${PN}-ptest += "make coreutils diffutils bash locale-base-fr-fr"
+RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
 RDEPENDS:${PN}-ptest:append:libc-glibc = "\
-     locale-base-fr-fr \
      locale-base-fr-fr.iso-8859-1 \
      glibc-gconv-iso8859-1 \
 "
Signature · 1 line
2.40.0
author
#1 lore raw

PATCH 2/2 lua: Disable locale dependent tests on musl

These tests depend on features of locale which is not fully available on musl

---
 meta/recipes-devtools/lua/lua_5.4.4.bb | 6 ++++++
 1 file changed, 6 insertions(+)
meta/recipes-devtools/lua/lua_5.4.4.bb +6 -0
index 4fa5c593cf..26ec35f997 100644
@@ -56,6 +56,12 @@ do_install_ptest () {
         cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV_testsuites}-tests ${D}${PTEST_PATH}/test
 }
 
+do_install_ptest:append:libc-musl () {
+        # locale tests does not work on musl, due to limited locale implementation
+        # https://wiki.musl-libc.org/open-issues.html#Locale-limitations
+        sed -i -e 's|os.setlocale("pt_BR") or os.setlocale("ptb")|false|g' ${D}${PTEST_PATH}/test/literals.lua
+}
+
 BBCLASSEXTEND = "native nativesdk"
 
 inherit multilib_script
Signature · 1 line
2.40.0