X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fncurses%2F0002-gcc-5.x-MKlib_gen.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fncurses%2F0002-gcc-5.x-MKlib_gen.patch;h=077120888e2c826b9c4cee5771f149727758571a;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/ncurses/0002-gcc-5.x-MKlib_gen.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/ncurses/0002-gcc-5.x-MKlib_gen.patch new file mode 100644 index 0000000..0771208 --- /dev/null +++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/ncurses/0002-gcc-5.x-MKlib_gen.patch @@ -0,0 +1,33 @@ +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 + +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" +