From 7eef4b12d9a34177607a4059a0e443c8976b65ec Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 8 Apr 2025 08:51:30 +0800 Subject: gawk: upgrade 5.3.1 -> 5.3.2 0001-Add-parameter-signatures-for-getenv-and-getopt.patch removed since it's included in 5.3.2 0001-configure.ac-re-enable-disabled-printf-features.patch refreshed for 5.3.2` (From OE-Core rev: a8773ae9d866063e0562589af44b90a89b5cd93c) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...arameter-signatures-for-getenv-and-getopt.patch | 54 ------------- ...ure.ac-re-enable-disabled-printf-features.patch | 8 +- meta/recipes-extended/gawk/gawk_5.3.1.bb | 91 ---------------------- meta/recipes-extended/gawk/gawk_5.3.2.bb | 90 +++++++++++++++++++++ 4 files changed, 94 insertions(+), 149 deletions(-) delete mode 100644 meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch delete mode 100644 meta/recipes-extended/gawk/gawk_5.3.1.bb create mode 100644 meta/recipes-extended/gawk/gawk_5.3.2.bb (limited to 'meta') diff --git a/meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch b/meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch deleted file mode 100644 index 7ed615a881..0000000000 --- a/meta/recipes-extended/gawk/gawk/0001-Add-parameter-signatures-for-getenv-and-getopt.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4a8352eeaa99bbea3461696855c973447e87abdd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 22 Mar 2025 15:14:16 -0700 -Subject: [PATCH] Add parameter signatures for getenv() and getopt() - -GCC-15 complains about it when building for musl C library - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-gawk/2025-03/msg00027.html] -Signed-off-by: Khem Raj ---- - missing_d/fnmatch.c | 2 +- - support/getopt.c | 2 +- - support/getopt.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/missing_d/fnmatch.c b/missing_d/fnmatch.c -index ccb7e34..7f97fbf 100644 ---- a/missing_d/fnmatch.c -+++ b/missing_d/fnmatch.c -@@ -121,7 +121,7 @@ USA. */ - whose names are inconsistent. */ - - # if !defined _LIBC && !defined getenv --extern char *getenv (); -+extern char *getenv (const char*); - # endif - - # ifndef errno -diff --git a/support/getopt.c b/support/getopt.c -index eeb71ba..e7ebd19 100644 ---- a/support/getopt.c -+++ b/support/getopt.c -@@ -152,7 +152,7 @@ static struct _getopt_data getopt_data; - whose names are inconsistent. */ - - #ifndef getenv --extern char *getenv (); -+extern char *getenv (const char*); - #endif - - #endif /* not __GNU_LIBRARY__ */ -diff --git a/support/getopt.h b/support/getopt.h -index 8393569..06482cf 100644 ---- a/support/getopt.h -+++ b/support/getopt.h -@@ -181,7 +181,7 @@ extern int __posix_getopt (int ___argc, char *const *___argv, - # endif - # endif - #else /* not __GNU_LIBRARY__ */ --extern int getopt (); -+extern int getopt (int, char * const*, const char *); - #endif /* __GNU_LIBRARY__ */ - - #ifndef __need_getopt diff --git a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch index 4fe60c7cb8..bcbc569531 100644 --- a/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch +++ b/meta/recipes-extended/gawk/gawk/0001-configure.ac-re-enable-disabled-printf-features.patch @@ -1,4 +1,4 @@ -From 879fb11c7c006a8533a092fb75b38d84cc570d83 Mon Sep 17 00:00:00 2001 +From 9ce3184188e3fa275fde0258a165f4446a6e80f7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 22 Nov 2024 12:13:58 +0100 Subject: [PATCH] configure.ac: re-enable disabled printf features @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index cb99ffe..5fe792f 100644 +index 0ccd460..7df7e5b 100644 --- a/configure.ac +++ b/configure.ac -@@ -398,7 +398,7 @@ int main() +@@ -400,7 +400,7 @@ int main() ])], has_f_format=yes, has_f_format=no, @@ -24,7 +24,7 @@ index cb99ffe..5fe792f 100644 ) if test "$has_f_format" = yes then -@@ -427,7 +427,7 @@ int main() +@@ -429,7 +429,7 @@ int main() ])], has_a_format=yes, has_a_format=no, diff --git a/meta/recipes-extended/gawk/gawk_5.3.1.bb b/meta/recipes-extended/gawk/gawk_5.3.1.bb deleted file mode 100644 index 1fe2f2b2a7..0000000000 --- a/meta/recipes-extended/gawk/gawk_5.3.1.bb +++ /dev/null @@ -1,91 +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: GPL-2.0-only -# gawk >= 3.1.6: GPL-3.0-only -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PACKAGECONFIG ??= "readline mpfr" -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-configure.ac-re-enable-disabled-printf-features.patch \ - file://0001-Add-parameter-signatures-for-getenv-and-getopt.patch \ - " - -SRC_URI[sha256sum] = "fa41b3a85413af87fb5e3a7d9c8fa8d4a20728c67651185bb49c38a7f9382b1e" - -inherit autotools gettext texinfo update-alternatives - -FILES:${PN} += "${datadir}/awk" -FILES:${PN}-dev += "${libdir}/${BPN}/*.la" - -PACKAGES =+ "${PN}-gawkbug" -FILES:${PN}-gawkbug += "${bindir}/gawkbug" - -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 - # 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 - -do_install_ptest() { - mkdir ${D}${PTEST_PATH}/test - ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk - # The list of tests is all targets in Maketests, apart from the dummy Gt-dummy - TESTS=$(awk -F: '$1 == "Gt-dummy" { next } /[[:alnum:]]+:$/ { print $1 }' ${S}/test/Maketests) - for i in $TESTS Maketests inclib.awk; do - cp ${S}/test/$i* ${D}${PTEST_PATH}/test - done - sed -i \ - -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \ - -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|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 - - # These tests require an unloaded host as otherwise timing sensitive tests can fail - # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371 - rm -f ${D}${PTEST_PATH}/test/time.* - rm -f ${D}${PTEST_PATH}/test/timeout.* - for t in time timeout; do - echo $t >> ${D}${PTEST_PATH}/test/skipped.txt - done -} - -do_install_ptest:append:libc-musl() { - # Reported https://lists.gnu.org/archive/html/bug-gawk/2021-02/msg00005.html - rm -f ${D}${PTEST_PATH}/test/clos1way6.* - # Needs en_US.UTF-8 but then does not work with musl - rm -f ${D}${PTEST_PATH}/test/backsmalls1.* - # Needs en_US.UTF-8 but then does not work with musl - rm -f ${D}${PTEST_PATH}/test/commas.* - # The below two need LANG=C inside the make rule for musl - rm -f ${D}${PTEST_PATH}/test/rebt8b1.* - rm -f ${D}${PTEST_PATH}/test/regx8bit.* - for t in clos1way6 backsmalls1 commas rebt8b1 regx8bit; do - echo $t >> ${D}${PTEST_PATH}/test/skipped.txt - done -} - -RDEPENDS:${PN}-ptest += "make locale-base-en-us coreutils" - -RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us.iso-8859-1" -RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/gawk/gawk_5.3.2.bb b/meta/recipes-extended/gawk/gawk_5.3.2.bb new file mode 100644 index 0000000000..833fe78bf9 --- /dev/null +++ b/meta/recipes-extended/gawk/gawk_5.3.2.bb @@ -0,0 +1,90 @@ +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: GPL-2.0-only +# gawk >= 3.1.6: GPL-3.0-only +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PACKAGECONFIG ??= "readline mpfr" +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-configure.ac-re-enable-disabled-printf-features.patch \ + " + +SRC_URI[sha256sum] = "8639a1a88fb411a1be02663739d03e902a6d313b5c6fe024d0bfeb3341a19a11" + +inherit autotools gettext texinfo update-alternatives + +FILES:${PN} += "${datadir}/awk" +FILES:${PN}-dev += "${libdir}/${BPN}/*.la" + +PACKAGES =+ "${PN}-gawkbug" +FILES:${PN}-gawkbug += "${bindir}/gawkbug" + +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 + # 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 + +do_install_ptest() { + mkdir ${D}${PTEST_PATH}/test + ln -s ${bindir}/gawk ${D}${PTEST_PATH}/gawk + # The list of tests is all targets in Maketests, apart from the dummy Gt-dummy + TESTS=$(awk -F: '$1 == "Gt-dummy" { next } /[[:alnum:]]+:$/ { print $1 }' ${S}/test/Maketests) + for i in $TESTS Maketests inclib.awk; do + cp ${S}/test/$i* ${D}${PTEST_PATH}/test + done + sed -i \ + -e 's|#! /bin/gawk|#! ${bindir}/gawk|g' \ + -e 's|#! /usr/local/bin/gawk|#! ${bindir}/gawk|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 + + # These tests require an unloaded host as otherwise timing sensitive tests can fail + # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14371 + rm -f ${D}${PTEST_PATH}/test/time.* + rm -f ${D}${PTEST_PATH}/test/timeout.* + for t in time timeout; do + echo $t >> ${D}${PTEST_PATH}/test/skipped.txt + done +} + +do_install_ptest:append:libc-musl() { + # Reported https://lists.gnu.org/archive/html/bug-gawk/2021-02/msg00005.html + rm -f ${D}${PTEST_PATH}/test/clos1way6.* + # Needs en_US.UTF-8 but then does not work with musl + rm -f ${D}${PTEST_PATH}/test/backsmalls1.* + # Needs en_US.UTF-8 but then does not work with musl + rm -f ${D}${PTEST_PATH}/test/commas.* + # The below two need LANG=C inside the make rule for musl + rm -f ${D}${PTEST_PATH}/test/rebt8b1.* + rm -f ${D}${PTEST_PATH}/test/regx8bit.* + for t in clos1way6 backsmalls1 commas rebt8b1 regx8bit; do + echo $t >> ${D}${PTEST_PATH}/test/skipped.txt + done +} + +RDEPENDS:${PN}-ptest += "make locale-base-en-us coreutils" + +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us.iso-8859-1" +RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf