[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-260-g9530646

[Julien B a. A. <ar...@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  95306460dd64419460b64a419e654522e5ce705a (commit)
       via  fe861f7e79249c1ca4b51e62b79e39cdbe053f5b (commit)
      from  987dd443499c7ca14da4c86a12614f35949c80e2 (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 95306460dd64419460b64a419e654522e5ce705a
Merge: fe861f7e79249c1ca4b51e62b79e39cdbe053f5b 987dd443499c7ca14da4c86a12614f35949c80e2
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 26 16:37:38 2011 +0100

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit fe861f7e79249c1ca4b51e62b79e39cdbe053f5b
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Jan 26 16:37:13 2011 +0100

    [BUILDROOT] 2010.11: ncurses-5.7: allows compilation even with old ncurses host installations

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

Summary of changes:
 ...42-ncurses-fix_compilation_with_old_hosts.patch |   25 ++++++++++++++++++++
 patches/buildroot/2010.11/cleanup_buildroot.sh     |    1 +
 2 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch

diff --git a/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch b/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch
new file mode 100644
index 0000000..dab5b77
--- /dev/null
+++ b/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch
@@ -0,0 +1,25 @@
+Old ncurses Host installation complains if tic is launched with -x option, so
+remove it.
+
+Bug & correction reporter: Loic Bartel.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch	2011-01-26 14:27:29.000000000 +0100
+@@ -0,0 +1,13 @@
++Index: ncurses-5.7/misc/run_tic.in
++===================================================================
++--- ncurses-5.7.org/misc/run_tic.in	2011-01-26 13:34:27.000000000 +0100
+++++ ncurses-5.7/misc/run_tic.in	2011-01-26 13:34:44.000000000 +0100
++@@ -110,7 +110,7 @@
++ 	document, and install the terminfo without the -x option.
++ 
++ EOF
++-if ( $SHLIB tic$suffix -x -s -o $TERMINFO $source )
+++if ( $SHLIB tic$suffix -s -o $TERMINFO $source )
++ then
++ 	echo '** built new '$TERMINFO
++ else
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 445ede6..fd8d896 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/ltris/
 rm -rf buildroot/package/qwt/
 rm -rf buildroot/fs/ubi/
 rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
+rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch


hooks/post-receive
-- 
armadeus