diff options
Diffstat (limited to 'meta/recipes-extended/bash/bash/use_aclocal.patch')
-rw-r--r-- | meta/recipes-extended/bash/bash/use_aclocal.patch | 26 |
1 files changed, 18 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..e966b037a2 100644 --- a/meta/recipes-extended/bash/bash/use_aclocal.patch +++ b/meta/recipes-extended/bash/bash/use_aclocal.patch | |||
@@ -1,21 +1,31 @@ | |||
1 | From b3a64702fa1978463c01bd5d9fe711e4628aba1e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 28 Dec 2020 21:04:27 +0100 | ||
4 | Subject: [PATCH] bash: update 5.0 -> 5.1 | ||
5 | |||
1 | Including m4 files directly like this confuses autotools.bbclass, remove | 6 | Including m4 files directly like this confuses autotools.bbclass, remove |
2 | the references and rely upon aclocal to collect the m4 files together | 7 | the references and rely upon aclocal to collect the m4 files together |
3 | as needed instead making it work like other autotools based projects. | 8 | as needed instead making it work like other autotools based projects. |
4 | 9 | ||
5 | Upstream-Status: Inappropriate [OE configuration specific] | 10 | Upstream-Status: Inappropriate [OE configuration specific] |
6 | RP 2021/1/20 | 11 | RP 2021/1/20 |
12 | --- | ||
13 | configure.ac | 43 ------------------------------------------- | ||
14 | 1 file changed, 43 deletions(-) | ||
7 | 15 | ||
8 | Index: bash-5.1/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
9 | =================================================================== | 17 | index 50a6e20..a3b5bd7 100644 |
10 | --- bash-5.1.orig/configure.ac | 18 | --- a/configure.ac |
11 | +++ bash-5.1/configure.ac | 19 | +++ b/configure.ac |
12 | @@ -688,47 +688,6 @@ if test x$SIZE = x; then | 20 | @@ -710,49 +710,6 @@ if test x$SIZE = x; then |
13 | fi | 21 | fi |
14 | AC_SUBST(SIZE) | 22 | AC_SUBST(SIZE) |
15 | 23 | ||
16 | -m4_include([m4/stat-time.m4]) | 24 | -m4_include([m4/stat-time.m4]) |
17 | -m4_include([m4/timespec.m4]) | 25 | -m4_include([m4/timespec.m4]) |
18 | - | 26 | - |
27 | -m4_include([m4/strtoimax.m4]) | ||
28 | - | ||
19 | -dnl include files for gettext | 29 | -dnl include files for gettext |
20 | - | 30 | - |
21 | -m4_include([m4/codeset.m4]) | 31 | -m4_include([m4/codeset.m4]) |
@@ -54,6 +64,6 @@ Index: bash-5.1/configure.ac | |||
54 | -m4_include([m4/wint_t.m4]) | 64 | -m4_include([m4/wint_t.m4]) |
55 | -m4_include([m4/xsize.m4]) | 65 | -m4_include([m4/xsize.m4]) |
56 | - | 66 | - |
57 | dnl Turn on any extensions available in the GNU C library. | 67 | dnl C compiler characteristics |
58 | AC_DEFINE(_GNU_SOURCE, 1) | 68 | AC_C_CONST |
59 | 69 | AC_C_INLINE | |