1 --- a/ncurses/base/MKlib_gen.sh 2 +++ b/ncurses/base/MKlib_gen.sh 3 @@ -474,11 +474,22 @@ sed -n -f $ED1 \ 4 -e 's/gen_$//' \ 5 -e 's/ / /g' >>$TMP 6 7 +cat >$ED1 <<EOF 8 +s/ / /g 9 +s/^ // 10 +s/ $// 11 +s/P_NCURSES_BOOL/NCURSES_BOOL/g 12 +EOF 13 + 14 +# A patch discussed here: 15 +# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html 16 +# introduces spurious #line markers. Work around that by ignoring the system's 17 +# attempt to define "bool" and using our own symbol here. 18 +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 19 +cat $ED2 >$TMP 20 + 21 $preprocessor $TMP 2>/dev/null \ 22 -| sed \ 23 - -e 's/ / /g' \ 24 - -e 's/^ //' \ 25 - -e 's/_Bool/NCURSES_BOOL/g' \ 26 +| sed -f $ED1 \ 27 | $AWK -f $AW2 \ 28 | sed -f $ED3 \ 29 | sed \