aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-03-03 18:55:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:24:05 +0000
commit31eb09a888729fcfd17d02f2a47375e10e87f79a (patch)
treea578525ad545530426438b26a042dd3bbf66471b /meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
parenta881acdcc4df8e29bc2107ef5c04ad96024ce2fb (diff)
downloadopenembedded-core-31eb09a888729fcfd17d02f2a47375e10e87f79a.tar.gz
bash: upgrade to 4.3
The bash-4.2-patches is obsolete. Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch')
-rw-r--r--meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
new file mode 100644
index 0000000000..a9391d6cac
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/mkbuiltins_have_stringize.patch
@@ -0,0 +1,26 @@
+On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by
+the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers
+use the STRING() macro from unistd.h. A header in the bash sources overrides
+the unistd.h macro to 'x' when HAVE_STRINGIZE is not defined, causing the
+wrappers to generate calls to 'xread' and 'xopen', which do not exist,
+resulting in a failure to link.
+
+Assume we have stringize support when cross-compiling, which works around the
+issue.
+
+It may be best for upstream to either give up on supporting compilers without
+stringize support, or to not define STRING() at all when FORTIFY_SOURCES is
+defined, letting the unistd.h one be used, instead.
+
+Upstream-Status: Pending
+
+--- bash-4.2.orig/builtins/mkbuiltins.c
++++ bash-4.2/builtins/mkbuiltins.c
+@@ -28,6 +28,7 @@
+ # define HAVE_STDLIB_H
+
+ # define HAVE_RENAME
++# define HAVE_STRINGIZE
+ #endif /* CROSS_COMPILING */
+
+ #if defined (HAVE_UNISTD_H)