diff options
author | Christopher Larson <chris_larson@mentor.com> | 2012-11-14 07:55:09 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-14 15:58:08 +0000 |
commit | 1fd9a16d2a4594a4e9179dc7353ac51ce32eb712 (patch) | |
tree | bab1377bacffc78c8f7b775ea410517ec4e9106e /meta/recipes-extended/bash/bash-4.2 | |
parent | aa75269454ebe7498e59fc2d6ca1fa43ce4b74bd (diff) | |
download | poky-1fd9a16d2a4594a4e9179dc7353ac51ce32eb712.tar.gz |
bash: fix mkbuiltins build failure
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.
(From OE-Core rev: f7a25dd72d1d463eb72d48c6f9dd968d376496c0)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash/bash-4.2')
-rw-r--r-- | meta/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch new file mode 100644 index 0000000000..a9391d6cac --- /dev/null +++ b/meta/recipes-extended/bash/bash-4.2/mkbuiltins_have_stringize.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | On hosts with FORTIFY_SOURCES, stringize support is required, as it's used by | ||
2 | the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers | ||
3 | use the STRING() macro from unistd.h. A header in the bash sources overrides | ||
4 | the unistd.h macro to 'x' when HAVE_STRINGIZE is not defined, causing the | ||
5 | wrappers to generate calls to 'xread' and 'xopen', which do not exist, | ||
6 | resulting in a failure to link. | ||
7 | |||
8 | Assume we have stringize support when cross-compiling, which works around the | ||
9 | issue. | ||
10 | |||
11 | It may be best for upstream to either give up on supporting compilers without | ||
12 | stringize support, or to not define STRING() at all when FORTIFY_SOURCES is | ||
13 | defined, letting the unistd.h one be used, instead. | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | --- bash-4.2.orig/builtins/mkbuiltins.c | ||
18 | +++ bash-4.2/builtins/mkbuiltins.c | ||
19 | @@ -28,6 +28,7 @@ | ||
20 | # define HAVE_STDLIB_H | ||
21 | |||
22 | # define HAVE_RENAME | ||
23 | +# define HAVE_STRINGIZE | ||
24 | #endif /* CROSS_COMPILING */ | ||
25 | |||
26 | #if defined (HAVE_UNISTD_H) | ||