diff options
-rw-r--r-- | meta/recipes-extended/bash/bash/pathexp-dep.patch | 13 | ||||
-rw-r--r-- | meta/recipes-extended/bash/bash_4.4.bb | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash/pathexp-dep.patch b/meta/recipes-extended/bash/bash/pathexp-dep.patch new file mode 100644 index 0000000000..e05bbda317 --- /dev/null +++ b/meta/recipes-extended/bash/bash/pathexp-dep.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | pathexp includes libintl.h but doesn't depend on it, thus a build race can occur. | ||
2 | |||
3 | Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503) | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/Makefile.in b/Makefile.in | ||
7 | index c7b62bc0..241cbf12 100644 | ||
8 | --- a/Makefile.in | ||
9 | +++ b/Makefile.in | ||
10 | @@ -1281,2 +1281,3 @@ nojobs.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h | ||
11 | y.tab.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h | ||
12 | +pathexp.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h | ||
13 | pcomplete.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h | ||
diff --git a/meta/recipes-extended/bash/bash_4.4.bb b/meta/recipes-extended/bash/bash_4.4.bb index e544d07c10..8b989ed3bd 100644 --- a/meta/recipes-extended/bash/bash_4.4.bb +++ b/meta/recipes-extended/bash/bash_4.4.bb | |||
@@ -26,6 +26,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ | |||
26 | file://fix-run-builtins.patch \ | 26 | file://fix-run-builtins.patch \ |
27 | file://0001-help-fix-printf-format-security-warning.patch \ | 27 | file://0001-help-fix-printf-format-security-warning.patch \ |
28 | file://bash-memleak-bug-fix-for-builtin-command-read.patch \ | 28 | file://bash-memleak-bug-fix-for-builtin-command-read.patch \ |
29 | file://pathexp-dep.patch \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25" | 32 | SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25" |