summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-04-21 01:00:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-27 14:41:31 +0100
commitdd317ae2a03a63e97c4f91b1e1dc343eb59e494d (patch)
tree1c29fb87407660682d0e85d3f79e98cc7378558a /meta
parentcce022a50770faca2125333996d053762f005e20 (diff)
downloadpoky-dd317ae2a03a63e97c4f91b1e1dc343eb59e494d.tar.gz
m4: Do not munge locale in ptests for musl
locale setting are done with glibc in mind and they cause segfaults with musl. Therefore make these tweaks specific to glibc (From OE-Core rev: ec613440e4fb9a9d1f35081654a6d95dee6dc3bd) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.19.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.19.inc b/meta/recipes-devtools/m4/m4-1.4.19.inc
index 3b4303b7fd..fcc9e58270 100644
--- a/meta/recipes-devtools/m4/m4-1.4.19.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.19.inc
@@ -40,8 +40,6 @@ do_install_ptest() {
40 cp -r ${B}/tests ${D}${PTEST_PATH} 40 cp -r ${B}/tests ${D}${PTEST_PATH}
41 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ 41 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
42 sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile 42 sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile
43 sed -i -e "s;LOCALE_FR='fr_FR';LOCALE_FR='fr_FR.iso88591';g" \
44 -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile
45 find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} 43 find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {}
46 cp ${S}/build-aux/update-copyright ${D}${PTEST_PATH}/tests/ 44 cp ${S}/build-aux/update-copyright ${D}${PTEST_PATH}/tests/
47 sed -i 's;update-copyright;./update-copyright;g' ${D}${PTEST_PATH}/tests/test-update-copyright.sh 45 sed -i 's;update-copyright;./update-copyright;g' ${D}${PTEST_PATH}/tests/test-update-copyright.sh
@@ -52,6 +50,10 @@ do_install_ptest() {
52 ln -s ptest ${D}${libdir}/${BPN}/${BP} 50 ln -s ptest ${D}${libdir}/${BPN}/${BP}
53} 51}
54 52
53do_install_ptest:append:libc-glibc() {
54 sed -i -e "s;LOCALE_FR='fr_FR';LOCALE_FR='fr_FR.iso88591';g" \
55 -e "s;LOCALE_FR_UTF8='none';LOCALE_FR_UTF8='fr_FR.utf8';g" ${D}${PTEST_PATH}/tests/Makefile
56}
55 57
56RDEPENDS:${PN}-ptest += "make coreutils diffutils bash" 58RDEPENDS:${PN}-ptest += "make coreutils diffutils bash"
57RDEPENDS:${PN}-ptest:append:libc-glibc = "\ 59RDEPENDS:${PN}-ptest:append:libc-glibc = "\