summaryrefslogtreecommitdiffstats
path: root/meta/classes/cml1.bbclass
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2014-11-07 17:15:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:17:05 +0000
commit889e02659dd396feba24f0b0ee6b4043c3f3735a (patch)
tree3a0a0ae9691feecd057f0bf14d2267591f9b8ddf /meta/classes/cml1.bbclass
parent8c27a1e25ae42a435ab7d290cab40f94f9286243 (diff)
downloadopenembedded-core-889e02659dd396feba24f0b0ee6b4043c3f3735a.tar.gz
openembedded-core-889e02659dd396feba24f0b0ee6b4043c3f3735a.tar.bz2
openembedded-core-889e02659dd396feba24f0b0ee6b4043c3f3735a.zip
ncurses, busybox, cml1.bbclass: Fix menuconfig display corruption
Previously there was a change to the ncurses compile to make it more like the typical way it was compiled on a host system. This fixed a whole class of host machines, but masked the real underlying problem with the display corruption issues and menuconfig. The corner case that led to the discovery that the wrong curses.h file was getting used was when there was no curses libraries at all on one of the development hosts. What had happened before was that /usr/include/curses.h on the host system had to match closely enough to the curses.h in the sysroot and then linking against the sysroot version of curses.so was ok (meaning no display corruption). But on some systems with ncurses.h vs curses.h such as SuSE hosts, there were still issues. If we fix the root of the problem and force the mconf and lxdialog to use the correct headers and libraries from the sysroot there is no further issues and the menuconfig target works properly. It also means we can back out the custom compilation flags to the ncurses recipe because they are no longer needed. For the kernel part of the menuconfig / nconfig changes it will be merged separately and this is all based on: https://lkml.org/lkml/2013/3/3/103 Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/cml1.bbclass')
-rw-r--r--meta/classes/cml1.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index b5adc47716..43acfd531b 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -9,10 +9,11 @@ addtask configure after do_unpack do_patch before do_compile
inherit terminal
-OE_TERMINAL_EXPORTS += "HOST_EXTRACFLAGS HOSTLDFLAGS HOST_LOADLIBES TERMINFO"
+OE_TERMINAL_EXPORTS += "HOST_EXTRACFLAGS HOSTLDFLAGS TERMINFO CROSS_CURSES_LIB CROSS_CURSES_INC"
HOST_EXTRACFLAGS = "${BUILD_CFLAGS} ${BUILD_LDFLAGS}"
HOSTLDFLAGS = "${BUILD_LDFLAGS}"
-HOST_LOADLIBES = "-lncurses"
+CROSS_CURSES_LIB = "-lncurses -ltinfo"
+CROSS_CURSES_INC = '-DCURSES_LOC="<curses.h>"'
TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo"
python do_menuconfig() {