| Submitter | Saul Wold |
|---|---|
| Date | Jan. 8, 2013, 10:39 p.m. |
| Message ID | <1357684790-1477-1-git-send-email-sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/42343/ |
| State | New |
| Headers | show |
Comments
ack *Andrei Gherzan* mobile +40.744.478.414 fax +40.31.816.28.12 Email: andrei@gherzan.ro Email: andrei.gherzan@windriver.com Romania On Wed, Jan 9, 2013 at 12:39 AM, Saul Wold <sgw@linux.intel.com> wrote: > Same patch for non-gplv3 version: > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=1fd9a16d2a4594a4e9179dc7353ac51ce32eb712 > > [YOCTO #3646] > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > .../bash-3.2.48/mkbuiltins_have_stringize.patch | 29 > ++++++++++++++++++++ > meta/recipes-extended/bash/bash_3.2.48.bb | 4 ++- > 2 files changed, 32 insertions(+), 1 deletion(-) > create mode 100644 > meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch > > diff --git > a/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch > b/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch > new file mode 100644 > index 0000000..c4229a7 > --- /dev/null > +++ > b/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch > @@ -0,0 +1,29 @@ > +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 > + > +Signed-off-by: Christopher Larson <chris_larson@mentor.com> > +Signed-off-by: Saul Wold <sgw@linux.intel.com> > + > +--- 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) > diff --git a/meta/recipes-extended/bash/bash_3.2.48.bbb/meta/recipes-extended/bash/ > bash_3.2.48.bb > index 828d629..4e6f0f3 100644 > --- a/meta/recipes-extended/bash/bash_3.2.48.bb > +++ b/meta/recipes-extended/bash/bash_3.2.48.bb > @@ -8,7 +8,9 @@ PR = "r11" > SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ > > ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0;name=patch001 > \ > > ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-050;apply=yes;striplevel=0;name=patch002 > \ > - > ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0;name=patch003" > + > ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0;name=patch003 > \ > + file://mkbuiltins_have_stringize.patch \ > + " > > SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" > SRC_URI[tarball.sha256sum] = > "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348" > -- > 1.7.9.5 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
Patch
diff --git a/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch b/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch new file mode 100644 index 0000000..c4229a7 --- /dev/null +++ b/meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch @@ -0,0 +1,29 @@ +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 + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +--- 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) diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index 828d629..4e6f0f3 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb @@ -8,7 +8,9 @@ PR = "r11" SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0;name=patch001 \ ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-050;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0;name=patch003" + ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0;name=patch003 \ + file://mkbuiltins_have_stringize.patch \ + " SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" SRC_URI[tarball.sha256sum] = "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348"
Same patch for non-gplv3 version: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=1fd9a16d2a4594a4e9179dc7353ac51ce32eb712 [YOCTO #3646] Signed-off-by: Saul Wold <sgw@linux.intel.com> --- .../bash-3.2.48/mkbuiltins_have_stringize.patch | 29 ++++++++++++++++++++ meta/recipes-extended/bash/bash_3.2.48.bb | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/bash/bash-3.2.48/mkbuiltins_have_stringize.patch