[OE-core] [daisy][PATCH 4/6] ncurses: fix build with gcc 5

[Andre McCurdy]

Use Gentoo version of backport of upstream patch:

  https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch

Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
---
 .../ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch    | 53 ++++++++++++++++++++++
 meta/recipes-core/ncurses/ncurses_5.9.bb           |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch

diff --git a/meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch b/meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch
new file mode 100644
index 0000000..a52d830
--- /dev/null
+++ b/meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey at invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+Upstream-Status: Backport
+
+  https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch
+
+Signed-off-by: Sanchar Banerjee <Sanchar.Banerjee at infosys.com>
+Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_5.9.bb
index 6d23c0c..0644926 100644
--- a/meta/recipes-core/ncurses/ncurses_5.9.bb
+++ b/meta/recipes-core/ncurses/ncurses_5.9.bb
@@ -4,6 +4,7 @@ PR = "${INC_PR}.1"
 
 SRC_URI += "file://tic-hang.patch \
             file://config.cache \
+            file://ncurses-5.9-gcc-5.patch \
 "
 
 SRC_URI[md5sum] = "8cb9c412e5f2d96bc6f459aa8c6282a1"
-- 
1.9.1