Magellan Linux

Contents of /trunk/ncurses/patches/ncurses-5.9-gcc51.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2572 - (show annotations) (download)
Thu Jun 11 14:30:10 2015 UTC (8 years, 10 months ago) by niro
File size: 1245 byte(s)
-gcc-5.1 build fixes
1 Submitted By: Douglas R. Reno <renodr2002@gmail.com>
2 Date: 2015-04-15
3 Initial Package Version: 5.9
4 Upstream Status: Unknown
5 Origin: ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20141206.patch.gz
6 Description: Fixes a compilation issue with GCC 5.1. Note that this patch was trimmed from the above patch.
7
8 Index: ncurses-5.9/ncurses/base/MKlib_gen.sh
9 ===========================================================================================
10
11 --- ncurses-5.9-20141129+/ncurses/base/MKlib_gen.sh 2011-06-04 19:14:08.000000000 +0000
12 +++ ncurses-5.9-20141206/ncurses/base/MKlib_gen.sh 2014-12-06 18:56:25.000000000 +0000
13 @@ -474,11 +474,22 @@
14 -e 's/gen_$//' \
15 -e 's/ / /g' >>$TMP
16
17 +cat >$ED1 <<EOF
18 +s/ / /g
19 +s/^ //
20 +s/ $//
21 +s/P_NCURSES_BOOL/NCURSES_BOOL/g
22 +EOF
23 +
24 +# A patch discussed here:
25 +# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
26 +# introduces spurious #line markers. Work around that by ignoring the system's
27 +# attempt to define "bool" and using our own symbol here.
28 +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
29 +cat $ED2 >$TMP
30 +
31 $preprocessor $TMP 2>/dev/null \
32 -| sed \
33 - -e 's/ / /g' \
34 - -e 's/^ //' \
35 - -e 's/_Bool/NCURSES_BOOL/g' \
36 +| sed -f $ED1 \
37 | $AWK -f $AW2 \
38 | sed -f $ED3 \
39 | sed \