diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5fdd994898..9250e9d451 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 | |||
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | DEPENDS = "ncurses-native" | 7 | DEPENDS = "ncurses-native" |
8 | DEPENDS_class-native = "" | 8 | DEPENDS_class-native = "" |
9 | INC_PR = "r13" | 9 | INC_PR = "r14" |
10 | 10 | ||
11 | inherit autotools binconfig multilib_header | 11 | inherit autotools binconfig multilib_header |
12 | 12 | ||
@@ -29,6 +29,31 @@ BUILD_CPPFLAGS += "-D_GNU_SOURCE" | |||
29 | # natives don't generally look in base_libdir | 29 | # natives don't generally look in base_libdir |
30 | base_libdir_class-native = "${libdir}" | 30 | base_libdir_class-native = "${libdir}" |
31 | 31 | ||
32 | # Display corruption occurs on 64 bit hosts without these settings | ||
33 | # This was derrived from the upstream debian ncurses which uses | ||
34 | # these settings for 32 and 64 bit hosts. | ||
35 | EXCONFIG_ARGS = "" | ||
36 | EXCONFIG_ARGS_virtclass-native = " \ | ||
37 | --disable-lp64 \ | ||
38 | --with-chtype='long' \ | ||
39 | --with-mmask-t='long'" | ||
40 | EXCONFIG_ARGS_virtclass-nativesdk = " \ | ||
41 | --disable-lp64 \ | ||
42 | --with-chtype='long' \ | ||
43 | --with-mmask-t='long'" | ||
44 | |||
45 | # Fall back to the host termcap / terminfo for -nativesdk and -native | ||
46 | # The reality is a work around for strange problems with things like | ||
47 | # "bitbake -c menuconfig busybox" where it cannot find the terminfo | ||
48 | # because the sstate had a hard coded search path. Until this is fixed | ||
49 | # another way this is deemed good enough. | ||
50 | EX_TERMCAP = "" | ||
51 | EX_TERMCAP_virtclass-native = ":/etc/termcap:/usr/share/misc/termcap" | ||
52 | EX_TERMCAP_virtclass-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" | ||
53 | EX_TERMINFO = "" | ||
54 | EX_TERMINFO_virtclass-native = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | ||
55 | EX_TERMINFO_virtclass-nativesdk = ":/etc/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | ||
56 | |||
32 | # Helper function for do_configure to allow multiple configurations | 57 | # Helper function for do_configure to allow multiple configurations |
33 | # $1 the directory to run configure in | 58 | # $1 the directory to run configure in |
34 | # $@ the arguments to pass to configure | 59 | # $@ the arguments to pass to configure |
@@ -44,8 +69,8 @@ ncurses_configure() { | |||
44 | --enable-hard-tabs \ | 69 | --enable-hard-tabs \ |
45 | --enable-xmc-glitch \ | 70 | --enable-xmc-glitch \ |
46 | --enable-colorfgbg \ | 71 | --enable-colorfgbg \ |
47 | --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap' \ | 72 | --with-termpath='${sysconfdir}/termcap:${datadir}/misc/termcap${EX_TERMCAP}' \ |
48 | --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo' \ | 73 | --with-terminfo-dirs='${sysconfdir}/terminfo:${datadir}/terminfo${EX_TERMINFO}' \ |
49 | --with-shared \ | 74 | --with-shared \ |
50 | --disable-big-core \ | 75 | --disable-big-core \ |
51 | --program-prefix= \ | 76 | --program-prefix= \ |
@@ -54,6 +79,7 @@ ncurses_configure() { | |||
54 | --enable-sigwinch \ | 79 | --enable-sigwinch \ |
55 | --enable-pc-files \ | 80 | --enable-pc-files \ |
56 | --disable-rpath-hack \ | 81 | --disable-rpath-hack \ |
82 | ${EXCONFIG_ARGS} \ | ||
57 | --with-manpage-format=normal \ | 83 | --with-manpage-format=normal \ |
58 | "$@" || return 1 | 84 | "$@" || return 1 |
59 | cd .. | 85 | cd .. |