summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-07-15 09:24:41 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 15:45:48 +0100
commit19715dafa51a94d7a4bde1c72bc3d07699aa2315 (patch)
tree8c9c75b1c3d09c994b24e2424f51165f072b5b1e /meta/recipes-core
parentac236b02d9ad43e3122cce7cb92bdbf5deeceabf (diff)
downloadpoky-19715dafa51a94d7a4bde1c72bc3d07699aa2315.tar.gz
ncurses: Resolve header and man page multilib conflicts
By default man pages are compressed, the way ncurses compresses them causes differences (timestamp and name) to be embedded into the gziped file. So each build will end up with a slightly different file. Avoid this, by not compressing the man pages. Avoid header conflict with curses.h using the multilib header helper. (From OE-Core rev: ae5269039511d0f3d8aa6a87cb8d9fcf01d79ddd) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 1e139a36e0..be7d387c9c 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
6SECTION = "libs" 6SECTION = "libs"
7DEPENDS = "ncurses-native" 7DEPENDS = "ncurses-native"
8DEPENDS_virtclass-native = "" 8DEPENDS_virtclass-native = ""
9INC_PR = "r0" 9INC_PR = "r1"
10 10
11inherit autotools binconfig 11inherit autotools binconfig multilib_header
12 12
13# Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ 13# Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
14SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" 14SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"
@@ -61,6 +61,7 @@ do_configure() {
61 --enable-sigwinch \ 61 --enable-sigwinch \
62 --enable-pc-files \ 62 --enable-pc-files \
63 --disable-rpath-hack \ 63 --disable-rpath-hack \
64 --with-manpage-format=normal \
64 "$@" 65 "$@"
65 cd .. 66 cd ..
66 done 67 done
@@ -161,6 +162,8 @@ do_install() {
161 f=${D}${libdir}/libtermcap.so 162 f=${D}${libdir}/libtermcap.so
162 echo '/* GNU ld script */' >$f 163 echo '/* GNU ld script */' >$f
163 echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f 164 echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f
165
166 oe_multilib_header curses.h
164} 167}
165 168
166python populate_packages_prepend () { 169python populate_packages_prepend () {