From f07f0b8b2799490c6be4e530b357b9eb03bd7bda Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 1 Jun 2015 15:44:48 +0800 Subject: gawk: upgrade to 4.1.3 The following two patches are removed because they have been merged in the new version. Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch Signed-off-by: Chen Qi --- ...-in-extension-Makefile.am-when-removing-..patch | 56 -------------- ...dd-DESTDIR-prefix-to-remaining-pkgextensi.patch | 86 ---------------------- meta/recipes-extended/gawk/gawk-4.1.1/run-ptest | 10 --- meta/recipes-extended/gawk/gawk-4.1.3/run-ptest | 10 +++ meta/recipes-extended/gawk/gawk_4.1.1.bb | 49 ------------ meta/recipes-extended/gawk/gawk_4.1.3.bb | 47 ++++++++++++ 6 files changed, 57 insertions(+), 201 deletions(-) delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.1/run-ptest create mode 100644 meta/recipes-extended/gawk/gawk-4.1.3/run-ptest delete mode 100644 meta/recipes-extended/gawk/gawk_4.1.1.bb create mode 100644 meta/recipes-extended/gawk/gawk_4.1.3.bb diff --git a/meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch b/meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch deleted file mode 100644 index b8b1fcaea7..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.1/Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch +++ /dev/null @@ -1,56 +0,0 @@ -From 976f73ab03569bb836aa5c949be1c1cc973b2d2e Mon Sep 17 00:00:00 2001 -From: "Arnold D. Robbins" -Date: Fri, 11 Apr 2014 07:42:16 +0300 -Subject: [PATCH] Use $(DESTDIR) in extension/Makefile.am when removing .la - files. - -commit 976f73ab03569bb836aa5c949be1c1cc973b2d2e upstream. - -[PG: note there was no Author SOB or long log in original.] -Upstream-Status: Backport [ gawk-4.1.1-3-g976f73ab0356 ] -Signed-off-by: Paul Gortmaker ---- - -diff --git a/extension/ChangeLog b/extension/ChangeLog -index afd64ff764b6..f3a1c7a81e7d 100644 ---- a/extension/ChangeLog -+++ b/extension/ChangeLog -@@ -1,3 +1,9 @@ -+2014-04-11 Arnold D. Robbins -+ -+ * Makefile.am (install-data-hook): Use $(DESTDIR) when removing -+ the .la files. Thanks to Lars Wendler -+ for the report and fix. -+ - 2014-04-08 Arnold D. Robbins - - * 4.1.1: Release tar ball made. -diff --git a/extension/Makefile.am b/extension/Makefile.am -index 9c49bb81abb2..11826e2b315e 100644 ---- a/extension/Makefile.am -+++ b/extension/Makefile.am -@@ -100,7 +100,7 @@ testext_la_LIBADD = $(MY_LIBS) - - install-data-hook: - for i in $(pkgextension_LTLIBRARIES) ; do \ -- $(RM) $(pkgextensiondir)/$$i ; \ -+ $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ - done - - # Keep the uninstall check working: -diff --git a/extension/Makefile.in b/extension/Makefile.in -index 040cdb8f4e23..d81b16960935 100644 ---- a/extension/Makefile.in -+++ b/extension/Makefile.in -@@ -1231,7 +1231,7 @@ uninstall-man: uninstall-man3 - - install-data-hook: - for i in $(pkgextension_LTLIBRARIES) ; do \ -- $(RM) $(pkgextensiondir)/$$i ; \ -+ $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ - done - - # Keep the uninstall check working: --- -1.9.1 - diff --git a/meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch b/meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch deleted file mode 100644 index b402587615..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.1/extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch +++ /dev/null @@ -1,86 +0,0 @@ -From a9f3bd754e9e269099cf7a2c931c632fcc12bd8a Mon Sep 17 00:00:00 2001 -From: Paul Gortmaker -Date: Fri, 13 Jun 2014 13:42:12 -0400 -Subject: [PATCH] extension: Add $(DESTDIR) prefix to remaining pkgextensiondir - instances - -Commit 976f73ab03569bb836aa5c949be1c1cc973b2d2e ["Use $(DESTDIR) in -extension/Makefile.am when removing .la files."] fixed an issue -that manifested itself as follows when cross compiling: - -make[4]: Entering directory 'gawk/4.1.1-r0/build/extension' -for i in filefuncs.la fnmatch.la fork.la inplace.la ordchr.la readdir.la readfi -le.la revoutput.la revtwoway.la rwarray.la testext.la time.la ; do \ - rm -f /usr/lib/gawk/$i ; \ -done -rm: cannot remove '/usr/lib/gawk/filefuncs.la': Permission denied -rm: cannot remove '/usr/lib/gawk/fnmatch.la': Permission denied -rm: cannot remove '/usr/lib/gawk/fork.la': Permission denied -rm: cannot remove '/usr/lib/gawk/inplace.la': Permission denied -rm: cannot remove '/usr/lib/gawk/ordchr.la': Permission denied -rm: cannot remove '/usr/lib/gawk/readdir.la': Permission denied -rm: cannot remove '/usr/lib/gawk/readfile.la': Permission denied -rm: cannot remove '/usr/lib/gawk/revoutput.la': Permission denied -rm: cannot remove '/usr/lib/gawk/revtwoway.la': Permission denied -rm: cannot remove '/usr/lib/gawk/rwarray.la': Permission denied -rm: cannot remove '/usr/lib/gawk/testext.la': Permission denied -rm: cannot remove '/usr/lib/gawk/time.la': Permission denied -Makefile:1235: recipe for target 'install-data-hook' failed - -The problem only manifests itself on hosts where the above files -are already present; for if they are absent then the rm -f does -not fail with -EPERM. The fix in 976f73ab0356 ensured that DESTDIR -was used for the prefix so that it didn't try to delete host files. - -However there still remains less used instances of where it is used -w/o $(DESTDIR) that may still cause similar breakage in the future. -Here we apply the same change to them. - -Upstream-Status: Submitted [http://lists.gnu.org/archive/html/bug-gawk/2014-06/index.html] -Signed-off-by: Paul Gortmaker ---- - -diff --git a/extension/ChangeLog b/extension/ChangeLog -index f3a1c7a81e7d..b87ac372edc6 100644 ---- a/extension/ChangeLog -+++ b/extension/ChangeLog -@@ -1,3 +1,10 @@ -+2014-06-13 Paul Gortmaker -+ * Makefile.am (uninstall-so): Came across below bug while cross -+ compiling, and changed both install-data-hook and uninstall-so -+ to use $(DESTDIR) on v4.1.1 before seeing most of the fix in -+ gawk-4.1.1-3-g976f73ab0356; here we ensure uninstall-so also -+ uses the $(DESTDIR) prefix on its use of pkgextensiondir. -+ - 2014-04-11 Arnold D. Robbins - - * Makefile.am (install-data-hook): Use $(DESTDIR) when removing -diff --git a/extension/Makefile.am b/extension/Makefile.am -index 11826e2b315e..b6beaee3fb47 100644 ---- a/extension/Makefile.am -+++ b/extension/Makefile.am -@@ -105,7 +105,7 @@ install-data-hook: - - # Keep the uninstall check working: - uninstall-so: -- $(RM) $(pkgextensiondir)/*.so -+ $(RM) $(DESTDIR)$(pkgextensiondir)/*.so - - uninstall-recursive: uninstall-so - -diff --git a/extension/Makefile.in b/extension/Makefile.in -index d81b16960935..294e4f887812 100644 ---- a/extension/Makefile.in -+++ b/extension/Makefile.in -@@ -1236,7 +1236,7 @@ install-data-hook: - - # Keep the uninstall check working: - uninstall-so: -- $(RM) $(pkgextensiondir)/*.so -+ $(RM) $(DESTDIR)$(pkgextensiondir)/*.so - - uninstall-recursive: uninstall-so - --- -1.9.1 - diff --git a/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.1/run-ptest deleted file mode 100644 index d23f0bf6d7..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.1/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.3/run-ptest b/meta/recipes-extended/gawk/gawk-4.1.3/run-ptest new file mode 100644 index 0000000000..d23f0bf6d7 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk-4.1.3/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.1.bb b/meta/recipes-extended/gawk/gawk_4.1.1.bb deleted file mode 100644 index 0a1811bb74..0000000000 --- a/meta/recipes-extended/gawk/gawk_4.1.1.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://Use-DESTDIR-in-extension-Makefile.am-when-removing-..patch \ - file://extension-Add-DESTDIR-prefix-to-remaining-pkgextensi.patch \ -" - -SRC_URI[md5sum] = "45f5b09aa87b4744c4c53bf274e96ed0" -SRC_URI[sha256sum] = "556464bd2e4bc5a0fad4526b59623e4be40b4c2f4c663dfaaf246af6e2ec1d62" - -inherit autotools gettext texinfo update-alternatives - -FILES_${PN} += "${datadir}/awk" -FILES_${PN}-dev += "${libdir}/${BPN}/*.la" -FILES_${PN}-dbg += "${libexecdir}/awk/.debug" - -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.3.bb b/meta/recipes-extended/gawk/gawk_4.1.3.bb new file mode 100644 index 0000000000..d1a88e45a9 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk_4.1.3.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 \ +" + +SRC_URI[md5sum] = "55d37f4069502677f25d1340df8eec97" +SRC_URI[sha256sum] = "524effa5b9ecd4ed940f2581c5d3c1df4e4bd7e6f768aa033c1916f47dfc6e29" + +inherit autotools gettext texinfo update-alternatives + +FILES_${PN} += "${datadir}/awk" +FILES_${PN}-dev += "${libdir}/${BPN}/*.la" +FILES_${PN}-dbg += "${libexecdir}/awk/.debug" + +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