mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 18:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

bash: fix build race under musl

Browse Source 
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>
This commit is contained in:
Ross Burton
2017-11-29 12:31:55 +00:00
committed by Richard Purdie
parent e49b5dfb4e
commit 749ddaaeaa
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-extended/bash/bash/pathexp-dep.patch Normal file
View File

@@ -0,0 +1,13 @@
pathexp includes libintl.h but doesn't depend on it, thus a build race can occur.
Upstream-Status: Submitted (https://savannah.gnu.org/patch/index.php?9503)
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/Makefile.in b/Makefile.in
index c7b62bc0..241cbf12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1281,2 +1281,3 @@ nojobs.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
y.tab.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
+pathexp.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
pcomplete.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h

1
meta/recipes-extended/bash/bash_4.4.bb
View File

@@ -26,6 +26,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
file://fix-run-builtins.patch \
file://0001-help-fix-printf-format-security-warning.patch \
file://bash-memleak-bug-fix-for-builtin-command-read.patch \
file://pathexp-dep.patch \
"
SRC_URI[tarball.md5sum] = "148888a7c95ac23705559b6f477dfe25"