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