ncurses: fix oebug 2554 - added STAGING_LIBDIR_NATIVE, and set

LD_LIBRARY_PATH in ncurses bb file.

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index dc3378fd954388bdfb9893713aa6820485154c82..d642998e8d734503832a47428e24ad5f3d27e10a 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -168,6 +168,7 @@ STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin"
 STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
 STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib"
 STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
 STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
 STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"

diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index 030cd1034c14e9359a2cf53d27754ca607ee5de8..027f037ee5ec6e47302b1a44f3f21b2bfd2e8d07 100644 (file)
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -41,6 +41,10 @@ do_stage() {
        ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a
 }
 
+# This is necessary so that the "tic" command executed during the install can
+# link with the correct libary in staging.
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
+
 do_install() {
        autotools_do_install
 

diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 63272b4779a13d7c344b418a70c5cb761696ec34..6da32232af9f8dfdbd6c30718948969581507875 100644 (file)
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
           file://visibility.patch;patch=1"