summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2013-02-09 22:06:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-08 11:03:16 (GMT)
commite26f12af028e9b4b42ff06e58605adac7133214b (patch)
tree395dd4bec2f76c74ca82563b03591d204cddd6d5
parentae8e10beb58ddf5a6fa3bb59061501182d530f37 (diff)
downloadpoky-e26f12af028e9b4b42ff06e58605adac7133214b.tar.gz
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. (From OE-Core rev: feafff8c529b659ba2b70d32e9f99cd95edde113) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc27
1 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index f9f1202..91f188a 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
6SECTION = "libs" 6SECTION = "libs"
7DEPENDS = "ncurses-native" 7DEPENDS = "ncurses-native"
8DEPENDS_virtclass-native = "" 8DEPENDS_virtclass-native = ""
9INC_PR = "r12" 9INC_PR = "r13"
10 10
11inherit autotools binconfig multilib_header 11inherit autotools binconfig multilib_header
12 12
@@ -54,6 +54,31 @@ EX_TERMINFO = ""
54EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo" 54EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
55EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo" 55EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
56 56
57# Display corruption occurs on 64 bit hosts without these settings
58# This was derrived from the upstream debian ncurses which uses
59# these settings for 32 and 64 bit hosts.
60EXCONFIG_ARGS = ""
61EXCONFIG_ARGS_virtclass-native = " \
62 --disable-lp64 \
63 --with-chtype='long' \
64 --with-mmask-t='long'"
65EXCONFIG_ARGS_virtclass-nativesdk = " \
66 --disable-lp64 \
67 --with-chtype='long' \
68 --with-mmask-t='long'"
69
70# Fall back to the host termcap / terminfo for -nativesdk and -native
71# The reality is a work around for strange problems with things like
72# "bitbake -c menuconfig busybox" where it cannot find the terminfo
73# because the sstate had a hard coded search path. Until this is fixed
74# another way this is deemed good enough.
75EX_TERMCAP = ""
76EX_TERMCAP_virtclass-native = ":/etc/termcap:/usr/share/misc/termcap"
77EX_TERMCAP_virtclass-nativesdk = ":/etc/termcap:/usr/share/misc/termcap"
78EX_TERMINFO = ""
79EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
80EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
81
57# Helper function for do_configure to allow multiple configurations 82# Helper function for do_configure to allow multiple configurations
58# $1 the directory to run configure in 83# $1 the directory to run configure in
59# $@ the arguments to pass to configure 84# $@ the arguments to pass to configure