From e461ded95a6e76b59bc7c1368479ce85e848e5ef Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 25 Oct 2024 13:39:09 +0800 Subject: bash: upgrade 5.2.32 -> 5.2.37 0001-fix-c99.patch refreshed for 5.2.37 (From OE-Core rev: fa9289b26b9b3fe7e79c7fa01f6a57b072d8fdcd) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash/0001-fix-c99.patch | 41 ---------------------- meta/recipes-extended/bash/bash_5.2.32.bb | 25 ------------- meta/recipes-extended/bash/bash_5.2.37.bb | 24 +++++++++++++ 3 files changed, 24 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-extended/bash/bash/0001-fix-c99.patch delete mode 100644 meta/recipes-extended/bash/bash_5.2.32.bb create mode 100644 meta/recipes-extended/bash/bash_5.2.37.bb diff --git a/meta/recipes-extended/bash/bash/0001-fix-c99.patch b/meta/recipes-extended/bash/bash/0001-fix-c99.patch deleted file mode 100644 index abd83d09af..0000000000 --- a/meta/recipes-extended/bash/bash/0001-fix-c99.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e8ec2d75a52bdc93c83a679a71a68f4033033b8b Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 19 Jun 2024 12:57:39 +0000 -Subject: [PATCH] Fix C99 problems - -Backport some fixes from upstream to fix configure checks that fail with GCC 14.1. - -Upstream-Status: Backport [devel branch] -Signed-off-by: Ross Burton ---- - aclocal.m4 | 3 +++ - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index cc97bd4..7423b99 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken, - #include - #include - #include -+#ifdef HAVE_UNISTD_H -+# include -+#endif /* HAVE_UNISTD_H */ - int - main() - { -diff --git a/configure.ac b/configure.ac -index a3b5bd7..2a38c6b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -842,7 +842,7 @@ AC_CHECK_DECLS([strtold], [ - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], -- [[long double r; char *foo, bar; r = strtold(foo, &bar);]] -+ [[long double r; char *foo, *bar; r = strtold(foo, &bar);]] - )], - [bash_cv_strtold_broken=no],[bash_cv_strtold_broken=yes]) - ] diff --git a/meta/recipes-extended/bash/bash_5.2.32.bb b/meta/recipes-extended/bash/bash_5.2.32.bb deleted file mode 100644 index b159c0232f..0000000000 --- a/meta/recipes-extended/bash/bash_5.2.32.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bash.inc - -# GPL-2.0-or-later (< 4.0), GPL-3.0-or-later (>= 4.0) -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://run-ptest \ - file://run-bash-ptests \ - file://fix-run-builtins.patch \ - file://use_aclocal.patch \ - file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ - file://fix-filesubst-errexit.patch \ - file://0001-fix-c99.patch \ - " - -SRC_URI[tarball.sha256sum] = "d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5" - -DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/bash/bash_5.2.37.bb b/meta/recipes-extended/bash/bash_5.2.37.bb new file mode 100644 index 0000000000..3dcaefa374 --- /dev/null +++ b/meta/recipes-extended/bash/bash_5.2.37.bb @@ -0,0 +1,24 @@ +require bash.inc + +# GPL-2.0-or-later (< 4.0), GPL-3.0-or-later (>= 4.0) +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://run-ptest \ + file://run-bash-ptests \ + file://fix-run-builtins.patch \ + file://use_aclocal.patch \ + file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ + file://fix-filesubst-errexit.patch \ + " + +SRC_URI[tarball.sha256sum] = "9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff" + +DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" + +BBCLASSEXTEND = "nativesdk" -- cgit v1.2.3-54-g00ecf