Signed-off-by: Khem Raj <[email protected]> --- ...0001-Provide-fixes-for-tests-on-musl.patch | 73 +++++++++++++++++++ meta/recipes-extended/gawk/gawk_5.2.1.bb | 7 +- 2 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-extended/gawk/gawk/0001-Provide-fixes-for-tests-on-musl.patch
diff --git a/meta/recipes-extended/gawk/gawk/0001-Provide-fixes-for-tests-on-musl.patch b/meta/recipes-extended/gawk/gawk/0001-Provide-fixes-for-tests-on-musl.patch new file mode 100644 index 0000000000..4ff2466c0e --- /dev/null +++ b/meta/recipes-extended/gawk/gawk/0001-Provide-fixes-for-tests-on-musl.patch @@ -0,0 +1,73 @@ +From 95bcf4397b6f727208f3c627b7d00dacec406d02 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Apr 2023 21:57:18 -0700 +Subject: [PATCH] Provide fixes for tests on musl + +Fixes rebt8b1 and regx8bit +Disable clos1way6 [1] + +Disable commas and backsmalls1, they do not work +with musl-locales somehow even though we do isntall +en_US.UTF-8 on target + +[1] https://lists.gnu.org/archive/html/bug-gawk/2021-02/msg00005.html + +Upstream-Status: Inappropriate [musl-specific] +Signed-off-by: Khem Raj <[email protected]> +--- + test/Maketests | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +--- a/test/Maketests ++++ b/test/Maketests +@@ -916,7 +916,8 @@ rebrackloc: + + rebt8b1: + @echo $@ +- @-AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ++ @-[ -z "$$LANG" ] && LANG=C; export LANG; \ ++ AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ + + rebuild: +@@ -1391,17 +1392,6 @@ clos1way5: + @-AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ + +-clos1way6: +- @echo $@ $(ZOS_FAIL) +- @-AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ +- +-commas: +- @echo $@ $(ZOS_FAIL) +- @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ +- AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ +- + crlf: + @echo $@ + @-AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +@@ -2003,7 +1993,8 @@ regnul2: + + regx8bit: + @echo $@ +- @-AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ++ @-[ -z "$$LANG" ] && LANG=C; export LANG; \ ++ AWKPATH="$(srcdir)" $(AWK) -f [email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ + + reint: +@@ -2256,12 +2247,6 @@ backbigs1: + @echo $@ $(ZOS_FAIL) + @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ + AWKPATH="$(srcdir)" $(AWK) -f [email protected] < "$(srcdir)"/[email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ +- @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ +- +-backsmalls1: +- @echo $@ $(ZOS_FAIL) +- @-[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; export GAWKLOCALE; \ +- AWKPATH="$(srcdir)" $(AWK) -f [email protected] < "$(srcdir)"/[email protected] >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @-$(CMP) "$(srcdir)"/[email protected] _$@ && rm -f _$@ + + backsmalls2: diff --git a/meta/recipes-extended/gawk/gawk_5.2.1.bb b/meta/recipes-extended/gawk/gawk_5.2.1.bb index e381bad148..b2eb6987ed 100644 --- a/meta/recipes-extended/gawk/gawk_5.2.1.bb +++ b/meta/recipes-extended/gawk/gawk_5.2.1.bb @@ -19,7 +19,7 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://remove-sensitive-tests.patch \ file://run-ptest \ " - +SRC_URI:append:libc-musl = " file://0001-Provide-fixes-for-tests-on-musl.patch " SRC_URI[sha256sum] = "529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c" inherit autotools gettext texinfo update-alternatives @@ -62,8 +62,9 @@ do_install_ptest() { rm -f ${D}${PTEST_PATH}/test/timeout.* } -RDEPENDS:${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make locale-base-en-us" -RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us locale-base-en-us.iso-8859-1" +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us.iso-8859-1" +RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales" BBCLASSEXTEND = "native nativesdk" -- 2.40.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#179958): https://lists.openembedded.org/g/openembedded-core/message/179958 Mute This Topic: https://lists.openembedded.org/mt/98235523/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
