From ae5269039511d0f3d8aa6a87cb8d9fcf01d79ddd Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 15 Jul 2011 09:24:41 -0500 Subject: 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. Signed-off-by: Mark Hatle --- meta/recipes-core/ncurses/ncurses.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core') 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 SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_virtclass-native = "" -INC_PR = "r0" +INC_PR = "r1" -inherit autotools binconfig +inherit autotools binconfig multilib_header # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/ SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz" @@ -61,6 +61,7 @@ do_configure() { --enable-sigwinch \ --enable-pc-files \ --disable-rpath-hack \ + --with-manpage-format=normal \ "$@" cd .. done @@ -161,6 +162,8 @@ do_install() { f=${D}${libdir}/libtermcap.so echo '/* GNU ld script */' >$f echo 'INPUT(AS_NEEDED(-ltinfo))' >>$f + + oe_multilib_header curses.h } python populate_packages_prepend () { -- cgit v1.2.3