diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-04-06 17:36:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-10 18:10:27 +0100 |
commit | 252d56646a6cbc474ca77264203e43721a708c05 (patch) | |
tree | b79582689e783897f6b0cc49645a9653faa0e96c /meta/recipes-core/ncurses/ncurses.inc | |
parent | f2d82a136bfe85e893e4c2b7b5922a4d823812c1 (diff) | |
download | poky-252d56646a6cbc474ca77264203e43721a708c05.tar.gz |
ncurses: Upgrade 4.9 stable to latest patchlevel 20150329
gcc5 barfs on older release
Change-Id: Ib1ad9b1cf7f16eb454da21fd61dc56fe1d9f6783
(From OE-Core rev: 47f67fae98faec17087a827eff141e05b0400560)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ncurses/ncurses.inc')
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 14 |
1 files changed, 12 insertions, 2 deletions
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" | |||
13 | inherit autotools binconfig-disabled multilib_header | 13 | inherit autotools binconfig-disabled multilib_header |
14 | 14 | ||
15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ | 15 | # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ |
16 | SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" | 16 | SRC_URI = "ftp://invisible-island.net/${BPN}/current/${BP}-${REVISION}.tgz" |
17 | 17 | ||
18 | EXTRA_AUTORECONF = "-I m4" | 18 | EXTRA_AUTORECONF = "-I m4" |
19 | CONFIG_SITE =+ "${WORKDIR}/config.cache" | 19 | CONFIG_SITE =+ "${WORKDIR}/config.cache" |
@@ -97,6 +97,8 @@ do_configure() { | |||
97 | # broken because it requires stdin to be pollable (which is | 97 | # broken because it requires stdin to be pollable (which is |
98 | # not the case for /dev/null redirections) | 98 | # not the case for /dev/null redirections) |
99 | export cf_cv_working_poll=yes | 99 | export cf_cv_working_poll=yes |
100 | #Remove ${includedir} from CPPFLAGS, need for cross compile | ||
101 | sed -i 's#-I${cf_includedir}##g' ${S}/configure || die "sed CPPFLAGS" | ||
100 | 102 | ||
101 | # The --enable-pc-files requires PKG_CONFIG_LIBDIR existed | 103 | # The --enable-pc-files requires PKG_CONFIG_LIBDIR existed |
102 | mkdir -p ${PKG_CONFIG_LIBDIR} | 104 | mkdir -p ${PKG_CONFIG_LIBDIR} |
@@ -105,6 +107,7 @@ do_configure() { | |||
105 | return 1 | 107 | return 1 |
106 | ! ${ENABLE_WIDEC} || \ | 108 | ! ${ENABLE_WIDEC} || \ |
107 | ncurses_configure "widec" "--enable-widec" "--without-progs" | 109 | ncurses_configure "widec" "--enable-widec" "--without-progs" |
110 | |||
108 | } | 111 | } |
109 | 112 | ||
110 | do_compile() { | 113 | do_compile() { |
@@ -231,7 +234,14 @@ do_install() { | |||
231 | # At some point we can rely on coreutils 8.16 which has ln -r. | 234 | # At some point we can rely on coreutils 8.16 which has ln -r. |
232 | lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so | 235 | lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so |
233 | fi | 236 | fi |
234 | 237 | if [ -d "${D}${includedir}/ncurses" ]; then | |
238 | for f in `find ${D}${includedir}/ncurses -name "*.h"` | ||
239 | do | ||
240 | f=`basename $f` | ||
241 | test -e ${D}${includedir}/$f && continue | ||
242 | ln -sf ncurses/$f ${D}${includedir}/$f | ||
243 | done | ||
244 | fi | ||
235 | oe_multilib_header curses.h | 245 | oe_multilib_header curses.h |
236 | } | 246 | } |
237 | 247 | ||