| Message ID | 1728452955-25051-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/26] bash: upgrade 5.2.32 -> 5.2.37 | expand |
Changes to 0001-fix-c99.patch seem to indicate it's a backport that's been already included and can be dropped altogether? Can you check please? Alex On Wed, 9 Oct 2024 at 07:49, wangmy via lists.openembedded.org <wangmy=fujitsu.com@lists.openembedded.org> wrote: > > From: Wang Mingyu <wangmy@fujitsu.com> > > 0001-fix-c99.patch > refreshed for 5.2.37 > > Changelog: > =========== > - fix issue where comparing quoted and unquoted words to be completed results > in readline not displaying possible matches > - fix for reading partial invalid multibyte characters > - fix compilation on systems that provide select or pselect but not both > - fix for parsing compound assignment while expanding alias > - fix autoconf test for broken strtold > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > .../bash/bash/0001-fix-c99.patch | 20 +++---------------- > .../bash/{bash_5.2.32.bb => bash_5.2.37.bb} | 2 +- > 2 files changed, 4 insertions(+), 18 deletions(-) > rename meta/recipes-extended/bash/{bash_5.2.32.bb => bash_5.2.37.bb} (90%) > > diff --git a/meta/recipes-extended/bash/bash/0001-fix-c99.patch b/meta/recipes-extended/bash/bash/0001-fix-c99.patch > index abd83d09af..e0f1a51433 100644 > --- a/meta/recipes-extended/bash/bash/0001-fix-c99.patch > +++ b/meta/recipes-extended/bash/bash/0001-fix-c99.patch > @@ -1,4 +1,4 @@ > -From e8ec2d75a52bdc93c83a679a71a68f4033033b8b Mon Sep 17 00:00:00 2001 > +From 60a075c6e3258df9799d067e360e4c63e24e229b Mon Sep 17 00:00:00 2001 > From: Ross Burton <ross.burton@arm.com> > Date: Wed, 19 Jun 2024 12:57:39 +0000 > Subject: [PATCH] Fix C99 problems > @@ -8,9 +8,8 @@ Backport some fixes from upstream to fix configure checks that fail with GCC 14. > Upstream-Status: Backport [devel branch] > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > - aclocal.m4 | 3 +++ > - configure.ac | 2 +- > - 2 files changed, 4 insertions(+), 1 deletion(-) > + aclocal.m4 | 3 +++ > + 1 file changed, 3 insertions(+) > > diff --git a/aclocal.m4 b/aclocal.m4 > index cc97bd4..7423b99 100644 > @@ -26,16 +25,3 @@ index cc97bd4..7423b99 100644 > 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 <stdlib.h>]], > -- [[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.37.bb > similarity index 90% > rename from meta/recipes-extended/bash/bash_5.2.32.bb > rename to meta/recipes-extended/bash/bash_5.2.37.bb > index b159c0232f..87e0aa24ec 100644 > --- a/meta/recipes-extended/bash/bash_5.2.32.bb > +++ b/meta/recipes-extended/bash/bash_5.2.37.bb > @@ -17,7 +17,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ > file://0001-fix-c99.patch \ > " > > -SRC_URI[tarball.sha256sum] = "d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5" > +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)}" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#205312): https://lists.openembedded.org/g/openembedded-core/message/205312 > Mute This Topic: https://lists.openembedded.org/mt/108904270/1686489 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/recipes-extended/bash/bash/0001-fix-c99.patch b/meta/recipes-extended/bash/bash/0001-fix-c99.patch index abd83d09af..e0f1a51433 100644 --- a/meta/recipes-extended/bash/bash/0001-fix-c99.patch +++ b/meta/recipes-extended/bash/bash/0001-fix-c99.patch @@ -1,4 +1,4 @@ -From e8ec2d75a52bdc93c83a679a71a68f4033033b8b Mon Sep 17 00:00:00 2001 +From 60a075c6e3258df9799d067e360e4c63e24e229b Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@arm.com> Date: Wed, 19 Jun 2024 12:57:39 +0000 Subject: [PATCH] Fix C99 problems @@ -8,9 +8,8 @@ Backport some fixes from upstream to fix configure checks that fail with GCC 14. Upstream-Status: Backport [devel branch] Signed-off-by: Ross Burton <ross.burton@arm.com> --- - aclocal.m4 | 3 +++ - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) + aclocal.m4 | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/aclocal.m4 b/aclocal.m4 index cc97bd4..7423b99 100644 @@ -26,16 +25,3 @@ index cc97bd4..7423b99 100644 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 <stdlib.h>]], -- [[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.37.bb similarity index 90% rename from meta/recipes-extended/bash/bash_5.2.32.bb rename to meta/recipes-extended/bash/bash_5.2.37.bb index b159c0232f..87e0aa24ec 100644 --- a/meta/recipes-extended/bash/bash_5.2.32.bb +++ b/meta/recipes-extended/bash/bash_5.2.37.bb @@ -17,7 +17,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://0001-fix-c99.patch \ " -SRC_URI[tarball.sha256sum] = "d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5" +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)}"