1 files changed, 29 insertions, 3 deletions

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ed7f001985..e4832f56db 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_virtclass-native = ""
-INC_PR = "r11"
+INC_PR = "r12"
 
 inherit autotools binconfig multilib_header
 
@@ -29,6 +29,31 @@ BUILD_CPPFLAGS += "-D_GNU_SOURCE"
 # natives don't generally look in base_libdir
 base_libdir_virtclass-native = "${libdir}"
 
+# Display corruption occurs on 64 bit hosts without these settings
+# This was derrived from the upstream debian ncurses which uses
+# these settings for 32 and 64 bit hosts.
+EXCONFIG_ARGS = ""
+EXCONFIG_ARGS_virtclass-native = " \
+                --disable-lp64 \
+                --with-chtype='long' \
+                --with-mmask-t='long'"
+EXCONFIG_ARGS_virtclass-nativesdk = " \
+                --disable-lp64 \
+                --with-chtype='long' \
+                --with-mmask-t='long'"
+
+# Fall back to the host termcap / terminfo for -nativesdk and -native
+# The reality is a work around for strange problems with things like
+# "bitbake -c menuconfig busybox" where it cannot find the terminfo
+# because the sstate had a hard coded search path.  Until this is fixed
+# another way this is deemed good enough.
+EX_TERMCAP = ""
+EX_TERMCAP_virtclass-native = ":/etc/termcap:/usr/share/misc/termcap"
+EX_TERMCAP_virtclass-nativesdk = ":/etc/termcap:/usr/share/misc/termcap"
+EX_TERMINFO = ""
+EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
+EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
+
 # Helper function for do_configure to allow multiple configurations
 # $1 the directory to run configure in
 # $@ the arguments to pass to configure
@@ -44,8 +69,8 @@ ncurses_configure() {
                 --enable-hard-tabs \
                 --enable-xmc-glitch \
                 --enable-colorfgbg \
-                --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \
-                --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \
+                --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap${EX_TERMCAP}' \
+                --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo${EX_TERMINFO}' \
                 --with-shared \
                 --disable-big-core \
                 --program-prefix= \
@@ -54,6 +79,7 @@ ncurses_configure() {
                 --enable-sigwinch \
                 --enable-pc-files \
                 --disable-rpath-hack \
+                ${EXCONFIG_ARGS} \
                 --with-manpage-format=normal \
                 "$@" || return 1
         cd ..