diff options
Diffstat (limited to 'yocto-poky/meta/recipes-core/ncurses/ncurses.inc')
| -rw-r--r-- | yocto-poky/meta/recipes-core/ncurses/ncurses.inc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/yocto-poky/meta/recipes-core/ncurses/ncurses.inc b/yocto-poky/meta/recipes-core/ncurses/ncurses.inc index ffd80ee7c..ff0117b82 100644 --- a/yocto-poky/meta/recipes-core/ncurses/ncurses.inc +++ b/yocto-poky/meta/recipes-core/ncurses/ncurses.inc @@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" -INC_PR = "r15" -BINCONFIG = "${bindir}/ncurses-config" +BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config" inherit autotools binconfig-disabled multilib_header pkgconfig # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ -SRC_URI = "ftp://invisible-island.net/${BPN}/current/${BP}-${REVISION}.tgz" +SRC_URI = "git://anonscm.debian.org/collab-maint/ncurses.git" EXTRA_AUTORECONF = "-I m4" CONFIG_SITE =+ "${WORKDIR}/config.cache" @@ -146,9 +145,14 @@ do_test() { # 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 \ -" +# Note that install.libs will also implicitly install header files, +# so we do not need to explicitly specify install.includes. +# Doing so could in fact result in a race condition, as both targets +# (install.libs and install.includes) would install the same headers +# at the same time + +_install_opts = " install.libs install.man " + _install_cfgs = "\ DESTDIR='${D}' \ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ @@ -265,8 +269,8 @@ BBCLASSEXTEND = "native nativesdk" PACKAGES += " \ ${PN}-tools \ - ${PN}-terminfo \ ${PN}-terminfo-base \ + ${PN}-terminfo \ " FILES_${PN} = "\ @@ -285,8 +289,8 @@ FILES_${PN}-tools = "\ ${bindir}/infotocap \ ${bindir}/captoinfo \ ${bindir}/infocmp \ - ${bindir}/clear${@['', '.${BPN\x7d']['${CLASSOVERRIDE}' == 'class-target']} \ - ${bindir}/reset${@['', '.${BPN\x7d']['${CLASSOVERRIDE}' == 'class-target']} \ + ${bindir}/clear${@['', '.${BPN}']['${CLASSOVERRIDE}' == 'class-target']} \ + ${bindir}/reset${@['', '.${BPN}']['${CLASSOVERRIDE}' == 'class-target']} \ ${bindir}/tack \ ${bindir}/tabs \ " |