summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-29 12:31:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:18 +0000
commit749ddaaeaa2421e4f58330096e28c6216fd37429 (patch)
treec43bde851943e7c733218d734953511354033901
parente49b5dfb4ee4fa3b8d903d2dc19aa44a01a93565 (diff)
downloadpoky-749ddaaeaa2421e4f58330096e28c6216fd37429.tar.gz
bash: fix build race under musl
Under musl bash uses its own libintl clone but there are some missing dependencies so it is possible for pathexp.o to be built whilst libintl.h is being written, leading to compile errors. (From OE-Core rev: d58c20fd45f4808cbc1726ec5b46edb1c60b9cf8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash/pathexp-dep.patch13
-rw-r--r--meta/recipes-extended/bash/bash_4.4.bb1
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 @@
1pathexp includes libintl.h but doesn't depend on it, thus a build race can occur.
2
3Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503)
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/Makefile.in b/Makefile.in
7index 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
31SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25" 32SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25"