Revert "ncurses: Remove obsolete compile fixes"
[openwrt/openwrt.git] / package / libs / ncurses / patches / 102-ncurses-5.9-gcc-5.patch
1 https://bugs.gentoo.org/545114
2
3 extracted from the upstream change (which had many unrelated commits in one)
4
5 From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
6 From: "Thomas E. Dickey" <dickey@invisible-island.net>
7 Date: Sun, 7 Dec 2014 03:10:09 +0000
8 Subject: [PATCH] ncurses 5.9 - patch 20141206
9
10 + modify MKlib_gen.sh to work around change in development version of
11 gcc introduced here:
12 https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
13 https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
14 (reports by Marcus Shawcroft, Maohui Lei).
15
16 --- a/ncurses/base/MKlib_gen.sh
17 +++ b/ncurses/base/MKlib_gen.sh
18 @@ -505,11 +505,22 @@ sed -n -f $ED1 \
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 \