summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/bash/bash/use_aclocal.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-11-14 20:00:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-15 09:38:37 +0000
commite8a9e74903763e244b2683fb1ffdeaacaf86363f (patch)
tree1ea46d2d6a5dc05edcb4e550e4d070628153a3d0 /meta/recipes-extended/bash/bash/use_aclocal.patch
parentd2b7bf95fccb6c09b1a5d727f01b3c7b7b3de125 (diff)
downloadpoky-e8a9e74903763e244b2683fb1ffdeaacaf86363f.tar.gz
bash: update 5.1.16 -> 5.2.9
Remove patches: execute_cmd.patch (purpose of patch unclear) makerace.patch/makerace2.patch (merged upstream) (From OE-Core rev: 9a12d977cb4a9a5369eebd6b47ffe35c2cb4fca8) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash/bash/use_aclocal.patch')
-rw-r--r--meta/recipes-extended/bash/bash/use_aclocal.patch27
1 files changed, 19 insertions, 8 deletions
diff --git a/meta/recipes-extended/bash/bash/use_aclocal.patch b/meta/recipes-extended/bash/bash/use_aclocal.patch
index bebaa08bfe..bd6870b386 100644
--- a/meta/recipes-extended/bash/bash/use_aclocal.patch
+++ b/meta/recipes-extended/bash/bash/use_aclocal.patch
@@ -1,3 +1,8 @@
1From d1bf23817afffd5917b74da6946e0c3b7e63e336 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 28 Dec 2020 21:04:27 +0100
4Subject: [PATCH] bash: update 5.0 -> 5.1
5
1Including m4 files directly like this confuses autotools.bbclass, remove 6Including m4 files directly like this confuses autotools.bbclass, remove
2the references and rely upon aclocal to collect the m4 files together 7the references and rely upon aclocal to collect the m4 files together
3as needed instead making it work like other autotools based projects. 8as needed instead making it work like other autotools based projects.
@@ -5,17 +10,23 @@ as needed instead making it work like other autotools based projects.
5Upstream-Status: Inappropriate [OE configuration specific] 10Upstream-Status: Inappropriate [OE configuration specific]
6RP 2021/1/20 11RP 2021/1/20
7 12
8Index: bash-5.1/configure.ac 13---
9=================================================================== 14 configure.ac | 43 -------------------------------------------
10--- bash-5.1.orig/configure.ac 15 1 file changed, 43 deletions(-)
11+++ bash-5.1/configure.ac 16
12@@ -688,47 +688,6 @@ if test x$SIZE = x; then 17diff --git a/configure.ac b/configure.ac
18index 50a6e20..a3b5bd7 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -710,49 +710,6 @@ if test x$SIZE = x; then
13 fi 22 fi
14 AC_SUBST(SIZE) 23 AC_SUBST(SIZE)
15 24
16-m4_include([m4/stat-time.m4]) 25-m4_include([m4/stat-time.m4])
17-m4_include([m4/timespec.m4]) 26-m4_include([m4/timespec.m4])
18- 27-
28-m4_include([m4/strtoimax.m4])
29-
19-dnl include files for gettext 30-dnl include files for gettext
20- 31-
21-m4_include([m4/codeset.m4]) 32-m4_include([m4/codeset.m4])
@@ -54,6 +65,6 @@ Index: bash-5.1/configure.ac
54-m4_include([m4/wint_t.m4]) 65-m4_include([m4/wint_t.m4])
55-m4_include([m4/xsize.m4]) 66-m4_include([m4/xsize.m4])
56- 67-
57 dnl Turn on any extensions available in the GNU C library. 68 dnl C compiler characteristics
58 AC_DEFINE(_GNU_SOURCE, 1) 69 AC_C_CONST
59 70 AC_C_INLINE