summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/bash/bash/0001-fix-c99.patch41
-rw-r--r--meta/recipes-extended/bash/bash_5.2.37.bb (renamed from meta/recipes-extended/bash/bash_5.2.32.bb)3
2 files changed, 1 insertions, 43 deletions
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 @@
1From e8ec2d75a52bdc93c83a679a71a68f4033033b8b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Wed, 19 Jun 2024 12:57:39 +0000
4Subject: [PATCH] Fix C99 problems
5
6Backport some fixes from upstream to fix configure checks that fail with GCC 14.1.
7
8Upstream-Status: Backport [devel branch]
9Signed-off-by: Ross Burton <ross.burton@arm.com>
10---
11 aclocal.m4 | 3 +++
12 configure.ac | 2 +-
13 2 files changed, 4 insertions(+), 1 deletion(-)
14
15diff --git a/aclocal.m4 b/aclocal.m4
16index cc97bd4..7423b99 100644
17--- a/aclocal.m4
18+++ b/aclocal.m4
19@@ -238,6 +238,9 @@ AC_CACHE_VAL(bash_cv_dup2_broken,
20 #include <sys/types.h>
21 #include <fcntl.h>
22 #include <stdlib.h>
23+#ifdef HAVE_UNISTD_H
24+# include <unistd.h>
25+#endif /* HAVE_UNISTD_H */
26 int
27 main()
28 {
29diff --git a/configure.ac b/configure.ac
30index a3b5bd7..2a38c6b 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -842,7 +842,7 @@ AC_CHECK_DECLS([strtold], [
34 [AC_COMPILE_IFELSE(
35 [AC_LANG_PROGRAM(
36 [[#include <stdlib.h>]],
37- [[long double r; char *foo, bar; r = strtold(foo, &bar);]]
38+ [[long double r; char *foo, *bar; r = strtold(foo, &bar);]]
39 )],
40 [bash_cv_strtold_broken=no],[bash_cv_strtold_broken=yes])
41 ]
diff --git a/meta/recipes-extended/bash/bash_5.2.32.bb b/meta/recipes-extended/bash/bash_5.2.37.bb
index b159c0232f..3dcaefa374 100644
--- a/meta/recipes-extended/bash/bash_5.2.32.bb
+++ b/meta/recipes-extended/bash/bash_5.2.37.bb
@@ -14,10 +14,9 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
14 file://use_aclocal.patch \ 14 file://use_aclocal.patch \
15 file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ 15 file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \
16 file://fix-filesubst-errexit.patch \ 16 file://fix-filesubst-errexit.patch \
17 file://0001-fix-c99.patch \
18 " 17 "
19 18
20SRC_URI[tarball.sha256sum] = "d3ef80d2b67d8cbbe4d3265c63a72c46f9b278ead6e0e06d61801b58f23f50b5" 19SRC_URI[tarball.sha256sum] = "9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff"
21 20
22DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" 21DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
23DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" 22DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"