1Fix gcc 5.x build failure 2 3Extracted from upstream commit 4http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. 5 6+ modify MKlib_gen.sh to work around change in development version of 7 gcc introduced here: 8 https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html 9 https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html 10 (reports by Marcus Shawcroft, Maohui Lei). 11 12Original author: Thomas E. Dickey <dickey@invisible-island.net> 13Signed-off-by: Mikhail Peselnik <bas@bmail.ru> 14[Adam Duskett: Refresh for 6.1] 15Signed-off-by: Adam Duskett <aduskett@gmail.com> 16--- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 17+++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 18@@ -505,11 +505,22 @@ 19 -e 's/gen_$//' \ 20 -e 's/ / /g' >>$TMP 21 22+cat >$ED1 <<EOF 23+s/ / /g 24+s/^ // 25+s/ $// 26+s/P_NCURSES_BOOL/NCURSES_BOOL/g 27+EOF 28+ 29+# A patch discussed here: 30+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html 31+# introduces spurious #line markers. Work around that by ignoring the system's 32+# attempt to define "bool" and using our own symbol here. 33+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 34+cat $ED2 >$TMP 35+ 36 $preprocessor $TMP 2>/dev/null \ 37-| sed \ 38- -e 's/ / /g' \ 39- -e 's/^ //' \ 40- -e 's/_Bool/NCURSES_BOOL/g' \ 41+| sed -f $ED1 \ 42 | $AWK -f $AW2 \ 43 | sed -f $ED3 \ 44 | sed \ 45