Patchwork [v2,7/8] ncurses: Resolve header and man page multilib conflicts

login
mail settings
Submitter Mark Hatle
Date July 26, 2011, 9:31 p.m.
Message ID <5eeeedb564b91817ce1f81f9267187b6f52b1b70.1311715727.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/8587/
State New, archived
Headers show

Comments

Mark Hatle - July 26, 2011, 9:31 p.m.
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

Patch

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 <mark.hatle@windriver.com>
---
 meta/recipes-core/ncurses/ncurses.inc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 1e139a3..be7d387 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 () {