diff options
Diffstat (limited to 'recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch')
-rw-r--r-- | recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch b/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch new file mode 100644 index 00000000..22b67c40 --- /dev/null +++ b/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Upstream-Status: Xen: Inappropriate [oe specific, cross compile issue] | ||
2 | Upstream-Status: Kernel: Pending | ||
3 | Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> | ||
4 | commit e6972e689a980ab28637e94e48c77eeace6abde5 | ||
5 | Author: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
6 | Date: Mon Jul 2 23:10:28 2018 -0400 | ||
7 | |||
8 | xen/kconfig,menuconfig,mconf-cfg: Allow specification of ncurses location | ||
9 | |||
10 | In some cross build environments such as the Yocto Project build | ||
11 | environment it provides an ncurses library that is compiled | ||
12 | differently than the host's version. This causes display corruption | ||
13 | problems when the host's curses includes are used instead of the | ||
14 | includes from the provided compiler are overridden. There is a second | ||
15 | case where there is no curses libraries at all on the host system and | ||
16 | menuconfig will just fail entirely. | ||
17 | |||
18 | The solution is simply to allow an override variable in | ||
19 | check-lxdialog.sh for environments such as the Yocto Project. Adding | ||
20 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | ||
21 | compiling and linking against the right headers and libraries. | ||
22 | |||
23 | Change-Id: Ibe8dfafc90655e3be2671dbbb0cb7f5631fc4d44 | ||
24 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
25 | cc: Michal Marek <mmarek@suse.cz> | ||
26 | cc: linux-kbuild@vger.kernel.org | ||
27 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
28 | |||
29 | diff --git a/xen/tools/kconfig/mconf-cfg.sh b/xen/tools/kconfig/mconf-cfg.sh | ||
30 | old mode 100755 | ||
31 | new mode 100644 | ||
32 | index c812872..65a9b9e | ||
33 | --- a/xen/tools/kconfig/mconf-cfg.sh | ||
34 | +++ b/xen/tools/kconfig/mconf-cfg.sh | ||
35 | @@ -4,6 +4,14 @@ | ||
36 | PKG="ncursesw" | ||
37 | PKG2="ncurses" | ||
38 | |||
39 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
40 | + echo libs=\'$CROSS_CURSES_LIB\' | ||
41 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
42 | + echo cflags=\'$CROSS_CURSES_INC\' | ||
43 | + fi | ||
44 | + exit 0 | ||
45 | +fi | ||
46 | + | ||
47 | if [ -n "$(command -v pkg-config)" ]; then | ||
48 | if pkg-config --exists $PKG; then | ||
49 | echo cflags=\"$(pkg-config --cflags $PKG)\" | ||