From 7bac3652c2ea0c4d60b1830bc07f2c4c2aaed0ae Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Fri, 4 Nov 2016 09:08:38 -0200 Subject: gawk: Update to version 4.1.4 Add patch to remove hashbang line in file test/arrayind1.awk. This patch fixes: / |WARNING: gawk-4.1.4-r0 do_package_qa: QA Issue: |/usr/lib/gawk/ptest/test/arrayind1.awk contained in package gawk-ptest |requires /usr/local/bin/awk, but no providers found in RDEPENDS_gawk-ptest? |[file-rdeps] \ Patch was submitted to upstream [1] [1] https://lists.gnu.org/archive/html/bug-gawk/2016-11/msg00003.html Signed-off-by: Fabio Berton Signed-off-by: Ross Burton --- meta/recipes-extended/gawk/gawk-4.1.3/run-ptest | 10 ----- meta/recipes-extended/gawk/gawk-4.1.4/run-ptest | 10 +++++ .../test-arrayind1-Remove-hashbang-line.patch | 30 ++++++++++++++ meta/recipes-extended/gawk/gawk_4.1.3.bb | 46 --------------------- meta/recipes-extended/gawk/gawk_4.1.4.bb | 47 ++++++++++++++++++++++ 5 files changed, 87 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.3/run-ptest create mode 100644 meta/recipes-extended/gawk/gawk-4.1.4/run-ptest create mode 100644 meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch delete mode 100644 meta/recipes-extended/gawk/gawk_4.1.3.bb create mode 100644 meta/recipes-extended/gawk/gawk_4.1.4.bb diff --git a/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest deleted file mode 100644 index d23f0bf6d7..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.3/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/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest new file mode 100644 index 0000000000..d23f0bf6d7 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk-4.1.4/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/test-arrayind1-Remove-hashbang-line.patch b/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch new file mode 100644 index 0000000000..d4262ed0d9 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch @@ -0,0 +1,30 @@ +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_4.1.3.bb b/meta/recipes-extended/gawk/gawk_4.1.3.bb deleted file mode 100644 index 6ca7f3ef45..0000000000 --- a/meta/recipes-extended/gawk/gawk_4.1.3.bb +++ /dev/null @@ -1,46 +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 \ -" - -SRC_URI[md5sum] = "55d37f4069502677f25d1340df8eec97" -SRC_URI[sha256sum] = "524effa5b9ecd4ed940f2581c5d3c1df4e4bd7e6f768aa033c1916f47dfc6e29" - -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; \ - do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \ - done -} diff --git a/meta/recipes-extended/gawk/gawk_4.1.4.bb b/meta/recipes-extended/gawk/gawk_4.1.4.bb new file mode 100644 index 0000000000..b888df197c --- /dev/null +++ b/meta/recipes-extended/gawk/gawk_4.1.4.bb @@ -0,0 +1,47 @@ +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; \ + do cp ${S}/test/$i* ${D}${PTEST_PATH}/test; \ + done +} -- cgit 1.2.3-korg