Re: [oe-commits] Khem Raj : ncurses: Upgrade 4.9 stable to latest patchlevel 20150329

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 4382 bytes --]

On Fri, Apr 10, 2015 at 05:10:48PM +0000, git@git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 47f67fae98faec17087a827eff141e05b0400560
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=47f67fae98faec17087a827eff141e05b0400560
> 
> Author: Khem Raj <raj.khem@gmail.com>
> Date:   Mon Apr  6 17:36:29 2015 +0000
> 
> ncurses: Upgrade 4.9 stable to latest patchlevel 20150329
> 
> gcc5 barfs on older release

In some builds I'm seeing failures like this:

ncurses/5.9-r15.1/ncurses-5.9-20150329/ncurses/tinfo/init_keytry.c:54:25: fatal error: init_keytry.h: No such file or directory
 #include <init_keytry.h>
                         ^
compilation terminated.
make[1]: *** [../objects/init_keytry.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Reverting this commit fixes the issue. The ${includedir} removal in
do_configure seems suspicious.

I'm trying to narrow why it fails in some builds and builds fine in
other builds even when they are relatively similar.

Any hints appreciated.

> Change-Id: Ib1ad9b1cf7f16eb454da21fd61dc56fe1d9f6783
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> ---
> 
>  meta/recipes-core/ncurses/ncurses.inc    | 14 ++++++++++++--
>  meta/recipes-core/ncurses/ncurses_5.9.bb |  8 +++++---
>  2 files changed, 17 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
> index 10f7dd1..225e369 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
>  }
>  
> diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_5.9.bb
> index 6d23c0c..54d27a9 100644
> --- a/meta/recipes-core/ncurses/ncurses_5.9.bb
> +++ b/meta/recipes-core/ncurses/ncurses_5.9.bb
> @@ -1,10 +1,12 @@
>  require ncurses.inc
>  
> +REVISION = "20150329"
> +
>  PR = "${INC_PR}.1"
>  
>  SRC_URI += "file://tic-hang.patch \
>              file://config.cache \
>  "
> -
> -SRC_URI[md5sum] = "8cb9c412e5f2d96bc6f459aa8c6282a1"
> -SRC_URI[sha256sum] = "9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b"
> +S = "${WORKDIR}/${BP}-${REVISION}"
> +SRC_URI[md5sum] = "cee991d09e69e60ebedef424804c52d4"
> +SRC_URI[sha256sum] = "5b64f40e4dce73e3aa83d15bd9257c6eff8790ec41150f0938bd87c0eb75828f"
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]