summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc14
-rw-r--r--meta/recipes-core/ncurses/ncurses_5.9.bb8
2 files changed, 17 insertions, 5 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"
13inherit autotools binconfig-disabled multilib_header 13inherit 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/
16SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" 16SRC_URI = "ftp://invisible-island.net/${BPN}/current/${BP}-${REVISION}.tgz"
17 17
18EXTRA_AUTORECONF = "-I m4" 18EXTRA_AUTORECONF = "-I m4"
19CONFIG_SITE =+ "${WORKDIR}/config.cache" 19CONFIG_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
110do_compile() { 113do_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
diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_5.9.bb
index 6d23c0c7ea..54d27a951b 100644
--- a/meta/recipes-core/ncurses/ncurses_5.9.bb
+++ b/meta/recipes-core/ncurses/ncurses_5.9.bb
@@ -1,10 +1,12 @@
1require ncurses.inc 1require ncurses.inc
2 2
3REVISION = "20150329"
4
3PR = "${INC_PR}.1" 5PR = "${INC_PR}.1"
4 6
5SRC_URI += "file://tic-hang.patch \ 7SRC_URI += "file://tic-hang.patch \
6 file://config.cache \ 8 file://config.cache \
7" 9"
8 10S = "${WORKDIR}/${BP}-${REVISION}"
9SRC_URI[md5sum] = "8cb9c412e5f2d96bc6f459aa8c6282a1" 11SRC_URI[md5sum] = "cee991d09e69e60ebedef424804c52d4"
10SRC_URI[sha256sum] = "9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b" 12SRC_URI[sha256sum] = "5b64f40e4dce73e3aa83d15bd9257c6eff8790ec41150f0938bd87c0eb75828f"