diff options
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index ae99e2ca04..b0311196ee 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 = "r8" +INC_PR = "r9" inherit autotools binconfig multilib_header @@ -107,10 +107,15 @@ do_test() { diff curses-narrowc.h curses-widec.h } +# Split original _install_opts to two parts. +# One is the options to install contents, the other is the parameters \ +# when running command "make install" _install_opts = "\ + install.libs install.includes install.man \ +" +_install_cfgs = "\ DESTDIR='${D}' \ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ - install.libs install.includes install.man \ " python do_install () { @@ -122,11 +127,19 @@ shell_do_install() { # Order of installation is important; widec installs a 'curses.h' # header with more definitions and must be installed last hence. # Compatibility of these headers will be checked in 'do_test()'. - oe_runmake -C narrowc ${_install_opts} \ - install.data install.progs + oe_runmake -C narrowc ${_install_cfgs} ${_install_opts} \ + install.progs + + # The install.data should run after install.libs, otherwise + # there would be a race issue in a very critical conditon, since + # tic will be run by install.data, and tic needs libtinfo.so + # which would be regenerated by install.libs. + oe_runmake -C narrowc ${_install_cfgs} \ + install.data + ! ${ENABLE_WIDEC} || \ - oe_runmake -C widec ${_install_opts} + oe_runmake -C widec ${_install_cfgs} ${_install_opts} cd narrowc |