diff options
authorJason Wessel <jason.wessel@windriver.com>2013-02-09 16:06:57 -0600
committerRoss Burton <ross.burton@intel.com>2013-04-30 12:31:39 +0100
commitfeafff8c529b659ba2b70d32e9f99cd95edde113 (patch)
parent26dc1d726387c76adbfb9df19c18daee10ab636c (diff)
ncurses.inc: Fix display corruption and add fallback for sstate compiled paths
CQID: WIND00402979 Display corruption was occurring on 64 bit hosts using menuconfig for the kernel and busybox with the ncurses-native or ncurses-nativesdk because the configure arguments were not sufficient vs the expected use from the upstream source. Also changed in this commit is to provide a fallback to the hard compiled paths for the terminfo and termcap. Eventually this needs to be fixed another way if we want a truly portable SDK because any SDK that is relocated or native binaries pulled out of the sstate can end up referencing terminfo files that no longer are in the same location. Because the host system has terminfo files that ncurses will happily use we might as well have a fall back to buy some time for a better fix, vs having thing just not work occasionally when using sstate. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index f9f1202e9c..91f188aec5 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 = "r12"
+INC_PR = "r13"
inherit autotools binconfig multilib_header
@@ -54,6 +54,31 @@ 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"
+# 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_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_virtclass-native = ":/etc/termcap:/usr/share/misc/termcap"
+EX_TERMCAP_virtclass-nativesdk = ":/etc/termcap:/usr/share/misc/termcap"
+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