equal
deleted
inserted
replaced
|
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 diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh |
|
17 index d8cc3c9..b91398c 100755 |
|
18 --- a/ncurses/base/MKlib_gen.sh |
|
19 +++ b/ncurses/base/MKlib_gen.sh |
|
20 @@ -474,11 +474,22 @@ sed -n -f $ED1 \ |
|
21 -e 's/gen_$//' \ |
|
22 -e 's/ / /g' >>$TMP |
|
23 |
|
24 +cat >$ED1 <<EOF |
|
25 +s/ / /g |
|
26 +s/^ // |
|
27 +s/ $// |
|
28 +s/P_NCURSES_BOOL/NCURSES_BOOL/g |
|
29 +EOF |
|
30 + |
|
31 +# A patch discussed here: |
|
32 +# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html |
|
33 +# introduces spurious #line markers. Work around that by ignoring the system's |
|
34 +# attempt to define "bool" and using our own symbol here. |
|
35 +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 |
|
36 +cat $ED2 >$TMP |
|
37 + |
|
38 $preprocessor $TMP 2>/dev/null \ |
|
39 -| sed \ |
|
40 - -e 's/ / /g' \ |
|
41 - -e 's/^ //' \ |
|
42 - -e 's/_Bool/NCURSES_BOOL/g' \ |
|
43 +| sed -f $ED1 \ |
|
44 | $AWK -f $AW2 \ |
|
45 | sed -f $ED3 \ |
|
46 | sed \ |