From c84c8666581bfd64b21498330925146d8fe81075 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 9 Nov 2017 10:12:14 +0800 Subject: gawk: upgrade to 4.2.0 test-arrayind1-Remove-hashbang-line.patch is dropped as it has been merged in new version. Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- meta/recipes-extended/gawk/gawk-4.1.4/run-ptest | 10 ----- .../test-arrayind1-Remove-hashbang-line.patch | 30 ------------- meta/recipes-extended/gawk/gawk/run-ptest | 10 +++++ meta/recipes-extended/gawk/gawk_4.1.4.bb | 49 ---------------------- meta/recipes-extended/gawk/gawk_4.2.0.bb | 48 +++++++++++++++++++++ 5 files changed, 58 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.4/run-ptest delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch create mode 100644 meta/recipes-extended/gawk/gawk/run-ptest delete mode 100644 meta/recipes-extended/gawk/gawk_4.1.4.bb create mode 100644 meta/recipes-extended/gawk/gawk_4.2.0.bb diff --git a/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest deleted file mode 100644 index d23f0bf6d7..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -cd test -for i in `grep -vE "@|^$|#|Gt-dummy" Maketests |awk -F: '{print $1}'`; \ - do LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} srcdir=`pwd` AWK=gawk CMP=cmp \ - make -f Maketests $i >$i.tmp 2>&1; \ - grep -q "Error" $i.tmp; \ - if [ $? -eq 0 ]; then echo "FAIL: $i"; \ - else echo "PASS: $i"; rm -f $i.tmp; fi; \ -done diff --git a/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch b/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch deleted file mode 100644 index d4262ed0d9..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a3a3f26078223c47871c7b53e5c015ad163ae045 Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Thu, 3 Nov 2016 14:50:52 -0200 -Subject: [PATCH] test/arrayind1: Remove hashbang line -Organization: O.S. Systems Software LTDA. - -Remove "#!/usr/local/bin/awk -f" as none of the other awk scripts in the -test suite have a hashbang. - -Upstream-Status: Submitted [1] - -[1] https://lists.gnu.org/archive/html/bug-gawk/2016-11/msg00003.html - -Signed-off-by: Fabio Berton ---- - test/arrayind1.awk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/arrayind1.awk b/test/arrayind1.awk -index 5d4a6f3..59e8b4e 100755 ---- a/test/arrayind1.awk -+++ b/test/arrayind1.awk -@@ -1,4 +1,3 @@ --#!/usr/local/bin/awk -f - # this script renums pedigrees with metafounders - # so that they are added *before*regular animals - # mf are ascertained because they are not in the 1st column --- -2.1.4 - diff --git a/meta/recipes-extended/gawk/gawk/run-ptest b/meta/recipes-extended/gawk/gawk/run-ptest new file mode 100644 index 0000000000..d23f0bf6d7 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk/run-ptest @@ -0,0 +1,10 @@ +#!/bin/sh + +cd test +for i in `grep -vE "@|^$|#|Gt-dummy" Maketests |awk -F: '{print $1}'`; \ + do LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} srcdir=`pwd` AWK=gawk CMP=cmp \ + make -f Maketests $i >$i.tmp 2>&1; \ + grep -q "Error" $i.tmp; \ + if [ $? -eq 0 ]; then echo "FAIL: $i"; \ + else echo "PASS: $i"; rm -f $i.tmp; fi; \ +done diff --git a/meta/recipes-extended/gawk/gawk_4.1.4.bb b/meta/recipes-extended/gawk/gawk_4.1.4.bb deleted file mode 100644 index 995d37d2ad..0000000000 --- a/meta/recipes-extended/gawk/gawk_4.1.4.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "GNU awk text processing utility" -DESCRIPTION = "The GNU version of awk, a text processing utility. \ -Awk interprets a special-purpose programming language to do \ -quick and easy text pattern matching and reformatting jobs." -HOMEPAGE = "https://www.gnu.org/software/gawk/" -BUGTRACKER = "bug-gawk@gnu.org" -SECTION = "console/utils" - -# gawk <= 3.1.5: GPLv2 -# gawk >= 3.1.6: GPLv3 -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS += "readline" - -PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" - -SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ - file://run-ptest \ - file://test-arrayind1-Remove-hashbang-line.patch \ -" - -SRC_URI[md5sum] = "f20c94ca51b6ebfc9bffb90f95c8ffbb" -SRC_URI[sha256sum] = "8c03080e2b5a56263e8783f6f1f306398d4591be18254041f3f547efef944d35" - -inherit autotools gettext texinfo update-alternatives - -FILES_${PN} += "${datadir}/awk" -FILES_${PN}-dev += "${libdir}/${BPN}/*.la" - -ALTERNATIVE_${PN} = "awk" -ALTERNATIVE_TARGET[awk] = "${bindir}/gawk" -ALTERNATIVE_PRIORITY = "100" - -do_install_append() { - # remove the link since we don't package it - rm ${D}${bindir}/awk -} - -inherit ptest - -do_install_ptest() { - mkdir ${D}${PTEST_PATH}/test - for i in `grep -vE "@|^$|#|Gt-dummy" ${S}/test/Maketests |awk -F: '{print $1}'` Maketests inclib.awk; \ - do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \ - done -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/gawk/gawk_4.2.0.bb b/meta/recipes-extended/gawk/gawk_4.2.0.bb new file mode 100644 index 0000000000..27f79a2bed --- /dev/null +++ b/meta/recipes-extended/gawk/gawk_4.2.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "GNU awk text processing utility" +DESCRIPTION = "The GNU version of awk, a text processing utility. \ +Awk interprets a special-purpose programming language to do \ +quick and easy text pattern matching and reformatting jobs." +HOMEPAGE = "https://www.gnu.org/software/gawk/" +BUGTRACKER = "bug-gawk@gnu.org" +SECTION = "console/utils" + +# gawk <= 3.1.5: GPLv2 +# gawk >= 3.1.6: GPLv3 +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS += "readline" + +PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" + +SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "0b598c31bc703d66082bd958d4189980" +SRC_URI[sha256sum] = "c88046c6e8396ee548bcb941e16def809b7b55b60a1044b5dd254094f347c7d9" + +inherit autotools gettext texinfo update-alternatives + +FILES_${PN} += "${datadir}/awk" +FILES_${PN}-dev += "${libdir}/${BPN}/*.la" + +ALTERNATIVE_${PN} = "awk" +ALTERNATIVE_TARGET[awk] = "${bindir}/gawk" +ALTERNATIVE_PRIORITY = "100" + +do_install_append() { + # remove the link since we don't package it + rm ${D}${bindir}/awk +} + +inherit ptest + +do_install_ptest() { + mkdir ${D}${PTEST_PATH}/test + for i in `grep -vE "@|^$|#|Gt-dummy" ${S}/test/Maketests |awk -F: '{print $1}'` Maketests inclib.awk; \ + do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \ + done +} + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg