From 47f67fae98faec17087a827eff141e05b0400560 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Apr 2015 17:36:29 +0000 Subject: ncurses: Upgrade 4.9 stable to latest patchlevel 20150329 gcc5 barfs on older release Change-Id: Ib1ad9b1cf7f16eb454da21fd61dc56fe1d9f6783 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/ncurses/ncurses.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/ncurses/ncurses.inc') diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 10f7dd175d..225e369267 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses-config" inherit autotools binconfig-disabled multilib_header # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ -SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" +SRC_URI = "ftp://invisible-island.net/${BPN}/current/${BP}-${REVISION}.tgz" EXTRA_AUTORECONF = "-I m4" CONFIG_SITE =+ "${WORKDIR}/config.cache" @@ -97,6 +97,8 @@ do_configure() { # broken because it requires stdin to be pollable (which is # not the case for /dev/null redirections) export cf_cv_working_poll=yes + #Remove ${includedir} from CPPFLAGS, need for cross compile + sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" # The --enable-pc-files requires PKG_CONFIG_LIBDIR existed mkdir -p ${PKG_CONFIG_LIBDIR} @@ -105,6 +107,7 @@ do_configure() { return 1 ! ${ENABLE_WIDEC} || \ ncurses_configure "widec" "--enable-widec" "--without-progs" + } do_compile() { @@ -231,7 +234,14 @@ do_install() { # At some point we can rely on coreutils 8.16 which has ln -r. lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so fi - + if [ -d "${D}${includedir}/ncurses" ]; then + for f in `find ${D}${includedir}/ncurses -name "*.h"` + do + f=`basename $f` + test -e ${D}${includedir}/$f && continue + ln -sf ncurses/$f ${D}${includedir}/$f + done + fi oe_multilib_header curses.h } -- cgit 1.2.3-korg