mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
gawk: update 5.1.1 -> 5.2.1
Place gawkbug into a separate package, as it includes target information which causes multilib conflicts. Adjust ptests so they are correctly executed: - unset LANG before starting - do not patch /usr/local/bin into /usr/bin; this is not correct (From OE-Core rev: b5422868b203ef69138406253946333f9928576e) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
6e2449e0f0
commit
f854c0ed9d
@@ -1,24 +1,43 @@
|
|||||||
|
From 354d24baf7c51977d22ff61ad42e6a2cbd4dc8ac Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@arm.com>
|
||||||
|
Date: Tue, 21 Dec 2021 17:09:12 +0000
|
||||||
|
Subject: [PATCH] gawk: remove load-sensitive tests
|
||||||
|
|
||||||
These tests require an unloaded host as otherwise timing sensitive tests can fail
|
These tests require an unloaded host as otherwise timing sensitive tests can fail
|
||||||
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371
|
https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371
|
||||||
|
|
||||||
Upstream-Status: Inappropriate
|
Upstream-Status: Inappropriate
|
||||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||||
|
|
||||||
--- a/test/Maketests~
|
---
|
||||||
+++ b/test/Maketests
|
test/Maketests | 10 ----------
|
||||||
@@ -2069,7 +2069,2 @@
|
1 file changed, 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/test/Maketests b/test/Maketests
|
||||||
|
index 3a667af..f117697 100644
|
||||||
|
--- a/test/Maketests
|
||||||
|
+++ b/test/Maketests
|
||||||
|
@@ -2137,11 +2137,6 @@ symtab12:
|
||||||
|
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
||||||
|
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
||||||
|
|
||||||
-timeout:
|
-timeout:
|
||||||
- @echo $@ $(ZOS_FAIL)
|
- @echo $@ $(ZOS_FAIL)
|
||||||
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
||||||
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
||||||
-
|
-
|
||||||
typedregex1:
|
typedregex1:
|
||||||
@@ -2297,7 +2292,2 @@
|
@echo $@
|
||||||
|
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
||||||
|
@@ -2371,11 +2366,6 @@ rwarray:
|
||||||
|
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk < "$(srcdir)"/$@.in >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
||||||
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
@-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
||||||
-
|
|
||||||
-time:
|
-time:
|
||||||
- @echo $@
|
- @echo $@
|
||||||
- @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
- @-AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
||||||
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
- @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@
|
||||||
|
-
|
||||||
|
mpfrbigint:
|
||||||
|
@echo $@
|
||||||
|
@-AWKPATH="$(srcdir)" $(AWK) -f $@.awk -M >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
cd test
|
cd test
|
||||||
for i in `grep -E "^[a-z0-9_-]*:$" Maketests |awk -F: '{print $1}'`; do
|
for i in `grep -E "^[a-z0-9_-]*:$" Maketests |awk -F: '{print $1}'`; do
|
||||||
#LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C}
|
unset LANG
|
||||||
srcdir=`pwd` AWKPROG=gawk AWK=gawk CMP=cmp make -f Maketests $i >$i.tmp 2>&1
|
srcdir=`pwd` AWKPROG=gawk AWK=gawk CMP=cmp make -f Maketests $i >$i.tmp 2>&1
|
||||||
if [ -e _$i ]; then
|
if [ -e _$i ]; then
|
||||||
cat _$i
|
cat _$i
|
||||||
|
|||||||
@@ -20,13 +20,16 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
|
|||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "6168d8d1dc8f74bd17d9dc22fa9634c49070f232343b744901da15fb4f06bffd"
|
SRC_URI[sha256sum] = "529e7c8c6acf21ff3a6183f4d763c632810908989c24675c77995d51ac37b79c"
|
||||||
|
|
||||||
inherit autotools gettext texinfo update-alternatives
|
inherit autotools gettext texinfo update-alternatives
|
||||||
|
|
||||||
FILES:${PN} += "${datadir}/awk"
|
FILES:${PN} += "${datadir}/awk"
|
||||||
FILES:${PN}-dev += "${libdir}/${BPN}/*.la"
|
FILES:${PN}-dev += "${libdir}/${BPN}/*.la"
|
||||||
|
|
||||||
|
PACKAGES =+ "${PN}-gawkbug"
|
||||||
|
FILES:${PN}-gawkbug += "${bindir}/gawkbug"
|
||||||
|
|
||||||
ALTERNATIVE:${PN} = "awk"
|
ALTERNATIVE:${PN} = "awk"
|
||||||
ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"
|
ALTERNATIVE_TARGET[awk] = "${bindir}/gawk"
|
||||||
ALTERNATIVE_PRIORITY = "100"
|
ALTERNATIVE_PRIORITY = "100"
|
||||||
@@ -34,6 +37,8 @@ ALTERNATIVE_PRIORITY = "100"
|
|||||||
do_install:append() {
|
do_install:append() {
|
||||||
# remove the link since we don't package it
|
# remove the link since we don't package it
|
||||||
rm ${D}${bindir}/awk
|
rm ${D}${bindir}/awk
|
||||||
|
# Strip non-reproducible build flags (containing build paths)
|
||||||
|
sed -i -e 's|^CC.*|CC=""|g' -e 's|^CFLAGS.*|CFLAGS=""|g' ${D}${bindir}/gawkbug
|
||||||
}
|
}
|
||||||
|
|
||||||
inherit ptest
|
inherit ptest
|
||||||
@@ -46,7 +51,7 @@ do_install_ptest() {
|
|||||||
for i in $TESTS Maketests inclib.awk; do
|
for i in $TESTS Maketests inclib.awk; do
|
||||||
cp ${S}/test/$i* ${D}${PTEST_PATH}/test
|
cp ${S}/test/$i* ${D}${PTEST_PATH}/test
|
||||||
done
|
done
|
||||||
sed -i -e 's|/usr/local/bin|${bindir}|g' \
|
sed -i \
|
||||||
-e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk
|
-e 's|#!${base_bindir}/awk|#!${bindir}/awk|g' ${D}${PTEST_PATH}/test/*.awk
|
||||||
|
|
||||||
sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests
|
sed -i -e "s|GAWKLOCALE|LANG|g" ${D}${PTEST_PATH}/test/Maketests
|
||||||
Reference in New Issue
Block a user