[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-36-gdba4d85

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  dba4d857cb5a65a5dc725566ba7c41b4bc3ec869 (commit)
      from  e9d9e430827a731081591e62ecf17893161a37ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dba4d857cb5a65a5dc725566ba7c41b4bc3ec869
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Feb 12 11:22:58 2016 +0100

    [BUILDROOT] 2015.02: ncurses: fix build issue with gcc 5.x

-----------------------------------------------------------------------

Summary of changes:
 .../230-ncurses-add-gcc-5.x-MKlib_gen-patch.patch  |   48 ++++++++++++++++++++
 patches/buildroot/2015.02/cleanup_buildroot.sh     |    1 +
 2 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2015.02/230-ncurses-add-gcc-5.x-MKlib_gen-patch.patch

diff --git a/patches/buildroot/2015.02/230-ncurses-add-gcc-5.x-MKlib_gen-patch.patch b/patches/buildroot/2015.02/230-ncurses-add-gcc-5.x-MKlib_gen-patch.patch
new file mode 100644
index 0000000..c07d068
--- /dev/null
+++ b/patches/buildroot/2015.02/230-ncurses-add-gcc-5.x-MKlib_gen-patch.patch
@@ -0,0 +1,48 @@
+Index: buildroot/package/ncurses/0002-gcc-5.x-MKlib_gen.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/ncurses/0002-gcc-5.x-MKlib_gen.patch
+@@ -0,0 +1,43 @@
++Fix gcc 5.x build failure
++
++Extracted from upstream commit
++http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517.
++
+++ 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).
++
++Original author: Thomas E. Dickey <di...@in...>
++Signed-off-by: Mikhail Peselnik <ba...@bm...>
++
++--- a/ncurses/base/MKlib_gen.sh.orig	2015-07-23 21:52:32.239481505 +0300
+++++ b/ncurses/base/MKlib_gen.sh	2015-07-23 21:53:20.772966587 +0300
++@@ -437,11 +437,22 @@
++ 	-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/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index dc2d003..65556cc 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -95,6 +95,7 @@ rm -rf buildroot/package/matiec/matiec.mk
 rm -rf buildroot/package/mmc-utils/mmc-utils.mk
 rm -rf buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
 rm -rf buildroot/package/multimedia/fsl-mm-codeclib/fsl-mm-codeclib.mk
+rm -rf buildroot/package/ncurses/0002-gcc-5.x-MKlib_gen.patch
 rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
 rm -rf buildroot/package/nss-pam-ldapd/Config.in
 rm -rf buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash


hooks/post-receive
-- 
armadeus