From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sys-libs/ncurses/files: ncurses-5.9-gcc-5.patch |
Date: | Tue, 31 Mar 2015 21:18:11 |
Message-Id: | 20150331211805.2DF5B14F16@oystercatcher.gentoo.org |
1 | vapier 15/03/31 21:18:03 |
2 | |
3 | Added: ncurses-5.9-gcc-5.patch |
4 | Log: |
5 | Add fix from upstream for building w/gcc-5 #545114#2 by David Kredba. |
6 | |
7 | (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
8 | |
9 | Revision Changes Path |
10 | 1.1 sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: ncurses-5.9-gcc-5.patch |
16 | =================================================================== |
17 | https://bugs.gentoo.org/545114 |
18 | |
19 | extracted from the upstream change (which had many unrelated commits in one) |
20 | |
21 | From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 |
22 | From: "Thomas E. Dickey" <dickey@××××××××××××××××.net> |
23 | Date: Sun, 7 Dec 2014 03:10:09 +0000 |
24 | Subject: [PATCH] ncurses 5.9 - patch 20141206 |
25 | |
26 | + modify MKlib_gen.sh to work around change in development version of |
27 | gcc introduced here: |
28 | https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html |
29 | https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html |
30 | (reports by Marcus Shawcroft, Maohui Lei). |
31 | |
32 | diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh |
33 | index d8cc3c9..b91398c 100755 |
34 | --- a/ncurses/base/MKlib_gen.sh |
35 | +++ b/ncurses/base/MKlib_gen.sh |
36 | @@ -474,11 +474,22 @@ sed -n -f $ED1 \ |
37 | -e 's/gen_$//' \ |
38 | -e 's/ / /g' >>$TMP |
39 | |
40 | +cat >$ED1 <<EOF |
41 | +s/ / /g |
42 | +s/^ // |
43 | +s/ $// |
44 | +s/P_NCURSES_BOOL/NCURSES_BOOL/g |
45 | +EOF |
46 | + |
47 | +# A patch discussed here: |
48 | +# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html |
49 | +# introduces spurious #line markers. Work around that by ignoring the system's |
50 | +# attempt to define "bool" and using our own symbol here. |
51 | +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2 |
52 | +cat $ED2 >$TMP |
53 | + |
54 | $preprocessor $TMP 2>/dev/null \ |
55 | -| sed \ |
56 | - -e 's/ / /g' \ |
57 | - -e 's/^ //' \ |
58 | - -e 's/_Bool/NCURSES_BOOL/g' \ |
59 | +| sed -f $ED1 \ |
60 | | $AWK -f $AW2 \ |
61 | | sed -f $ED3 \ |
62 | | sed \ |