From 5e101a3ab00a9f3188bef8a73fbcccc2f7845af2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 2 Nov 2021 09:42:53 +0100 Subject: gawk: update 5.1.0 -> 5.1.1 (From OE-Core rev: ff2a4b3c2f1e81d8cc1bd2b4f823e83a775f641a) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../gawk/0001-Use-cross-AR-during-compile.patch | 30 ----------- meta/recipes-extended/gawk/gawk_5.1.0.bb | 61 ---------------------- meta/recipes-extended/gawk/gawk_5.1.1.bb | 59 +++++++++++++++++++++ 3 files changed, 59 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch delete mode 100644 meta/recipes-extended/gawk/gawk_5.1.0.bb create mode 100644 meta/recipes-extended/gawk/gawk_5.1.1.bb (limited to 'meta/recipes-extended/gawk') diff --git a/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch b/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch deleted file mode 100644 index be6dbe1e57..0000000000 --- a/meta/recipes-extended/gawk/gawk/0001-Use-cross-AR-during-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 47dce6a7002a8d7b818c19d574d81327b769871b Mon Sep 17 00:00:00 2001 -From: "Arnold D. Robbins" -Date: Fri, 5 Jun 2020 13:14:54 +0300 -Subject: Allow for cross-compile version of ar. - ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -(limited to 'configure.ac') - -diff --git a/configure.ac b/configure.ac -index 31364ab8..8c256f21 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -105,6 +105,9 @@ AC_EXEEXT - AC_PROG_INSTALL - AC_PROG_MAKE_SET - -+# support/ builds libsupport.a, allow for cross version of ar -+AM_PROG_AR -+ - # This is mainly for my use during testing and development. - # Yes, it's a bit of a hack. - AC_MSG_CHECKING([for special development options]) --- -cgit v1.2.1 diff --git a/meta/recipes-extended/gawk/gawk_5.1.0.bb b/meta/recipes-extended/gawk/gawk_5.1.0.bb deleted file mode 100644 index 0961efa897..0000000000 --- a/meta/recipes-extended/gawk/gawk_5.1.0.bb +++ /dev/null @@ -1,61 +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" - -PACKAGECONFIG ??= "readline" -PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" - -SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ - file://run-ptest \ - file://0001-Use-cross-AR-during-compile.patch \ - file://test-time.patch \ -" - -SRC_URI[md5sum] = "f719bc9966df28e67fc6ebc405e7ea03" -SRC_URI[sha256sum] = "03a0360edcd84bec156fe211bbc4fc8c78790973ce4e8b990a11d778d40b1a26" - -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 - ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk - 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 - sed -i -e 's|/usr/local/bin|${bindir}|g' \ - -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 -} - -RDEPENDS:${PN}-ptest += "make" - -RDEPENDS:${PN}-ptest:append:libc-glibc = "\ - locale-base-en-us.iso-8859-1 \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/gawk/gawk_5.1.1.bb b/meta/recipes-extended/gawk/gawk_5.1.1.bb new file mode 100644 index 0000000000..215ac8c860 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk_5.1.1.bb @@ -0,0 +1,59 @@ +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" + +PACKAGECONFIG ??= "readline" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" +PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" + +SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ + file://run-ptest \ + file://test-time.patch \ + " + +SRC_URI[sha256sum] = "6168d8d1dc8f74bd17d9dc22fa9634c49070f232343b744901da15fb4f06bffd" + +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 + ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk + 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 + sed -i -e 's|/usr/local/bin|${bindir}|g' \ + -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 +} + +RDEPENDS:${PN}-ptest += "make" + +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ + locale-base-en-us.iso-8859-1 \ +" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf