Fix ncurses gcc-5.0 compile issue (for real)
PATCH 1/1 Fix ncurses gcc-5.0 compile issue (for real)
The previous patch didn't work in all cases. The new patch is taken from upstream:
--- package/ncurses/0002-gcc-5.x-MKlib_gen.patch | 60 +++++++++++++--------------- 1 file changed, 28 insertions(+), 32 deletions(-)
package/ncurses/0002-gcc-5.x-MKlib_gen.patch +28 -32
@@ -1,33 +1,29 @@ -Fix GCC 5.x preprocessor failure - -Building ncurses 5.9 with GCC 5.x fails with a syntax error, caused by -earlier preprocessing. This failure is more likely when building for -host (e.g. host-ncurses) that recently updated to GCC 5.x. - -This patch is taken from the following link (more information is also -available here): -https://groups.google.com/forum/#!topic/sage-trac/U31shviuqzk - -Signed-off-by: Doug Kehn <[email protected]> - -Index: b/ncurses/base/MKlib_gen.sh -=================================================================== ---- a/ncurses/base/MKlib_gen.sh -+++ b/ncurses/base/MKlib_gen.sh -@@ -62,7 +62,15 @@ if test "${LC_MESSAGES+set}" = set; then - if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi - --preprocessor="$1 -DNCURSES_INTERNALS -I../include" -+# Work around "unexpected" output of GCC 5.1.0's cpp w.r.t. #line directives -+# by simply suppressing them: -+case `$1 -dumpversion 2>/dev/null` in -+ 5.[01].*) # assume a "broken" one -+ preprocessor="$1 -P -DNCURSES_INTERNALS -I../include" -+ ;; -+ *) -+ preprocessor="$1 -DNCURSES_INTERNALS -I../include" -+esac - AWK="$2" - USE="$3" +--- host-ncurses-5.9/ncurses/base/MKlib_gen.sh.orig 2015-07-23 21:52:32.239481505 +0300 ++++ host-ncurses-5.9/ncurses/base/MKlib_gen.sh 2015-07-23 21:53:20.772966587 +0300 +@@ -437,11 +437,22 @@ + -e 's/gen_$//' \ + -e 's/ / /g' >>$TMP ++cat >$ED1 <<EOF ++s/ / /g ++s/^ // ++s/ $// ++s/P_NCURSES_BOOL/NCURSES_BOOL/g ++EOF ++ ++# A patch discussed here: ++# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html ++# introduces spurious #line markers. Work around that by ignoring the system's ++# attempt to define "bool" and using our own symbol here. ++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 ++cat $ED2 >$TMP ++ + $preprocessor $TMP 2>/dev/null \ +-| sed \ +- -e 's/ / /g' \ +- -e 's/^ //' \ +- -e 's/_Bool/NCURSES_BOOL/g' \ ++| sed -f $ED1 \ + | $AWK -f $AW2 \ + | sed -f $ED3 \ + | sed \
Signature · 1 line
2.4.6
PATCH 1/1 Fix ncurses gcc-5.0 compile issue (for real)
Quoted 5 lines · kyak
The previous patch didn't work in all cases. The new patch is taken from upstream:
Signed-off-by kyak <[email protected]>
Thanks, i've just hit this issue minutes ago, nice timing.
(x86_64 gcc 5.2.0 and blackfin 4.3.5)
Regards.
PATCH 1/1 Fix ncurses gcc-5.0 compile issue (for real)
In reply to kyakDear kyak,
Quoted 5 lines · kyak
The previous patch didn't work in all cases. The new patch is taken from upstream:
Signed-off-by kyak <[email protected]>
We need a real name for Signed-off-by / Author. Can you fix this?
Also:
* There should be one empty line before the Signed-off-by line.
* The title should be "<package>: <description>", so: "ncurses: fix gcc 5 compile issue for real" (saying 5.0 is incorrect since there has never really been a gcc 5.0, the first stable release was 5.1).
* Can you include the upstream patch reference in the patch description itself, and Signed-off-by the patch itself as well? See
http://buildroot.org/downloads/manual/manual.html#_format_and_licensing_of_the_package_patches
for more details.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 Fix ncurses gcc-5.0 compile issue (for real)
In reply to kyakQuoted 8 lines · kyak
The previous patch didn't work in all cases. The new patch is taken from upstream:
Signed-off-by kyak <[email protected]>--- package/ncurses/0002-gcc-5.x-MKlib_gen.patch | 60 +++++++++++++--------------- 1 file changed, 28 insertions(+), 32 deletions(-)
However: the patch does NOT work here, it does not apply;
[jaap at jaap /data/work/zupr/ZUPR-Embedded-Buildroot ]$ cat p.patch | patch -Np1 patching file package/ncurses/0002-gcc-5.x-MKlib_gen.patch
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file package/ncurses/0002-gcc-5.x-MKlib_gen.patch.rej
[jaap at jaap /data/work/zupr/ZUPR-Embedded-Buildroot ]$
regards,
Jaap Crezee