[oe-commits] org.oe.dev ncurses: fix oebug 2554 - added STAGING_LIBDIR_NATIVE, and set

[mwester commit]

ncurses: fix oebug 2554 - added STAGING_LIBDIR_NATIVE, and set
LD_LIBRARY_PATH in ncurses bb file.

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: fa5205e7ce54c529fcd971c7958a7052b56c58ff
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fa5205e7ce54c529fcd971c7958a7052b56c58ff
Files:
1
conf/bitbake.conf
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.4.bb
Diffs:

#
# mt diff -r51d54920e9415bae1f8924c1c9e72abf5f918ac6 -rfa5205e7ce54c529fcd971c7958a7052b56c58ff
#
# 
# 
# patch "conf/bitbake.conf"
#  from [913268fdd4af9c8f090f039d3c1dfe172bb3b59f]
#    to [6eb2dc8d0201f633066436d2ca7e95bb6959844f]
# 
# patch "packages/ncurses/ncurses.inc"
#  from [da4a903e1de796a50285b8e65823d214d89d2ea9]
#    to [689c6691a65c3ebf75e0f00795ee5f1ea3c348d0]
# 
# patch "packages/ncurses/ncurses_5.4.bb"
#  from [b3e5f45623a8c35ae179e1aa93ca97b484fe83a9]
#    to [72e763fb5ea691972f152eeaf0b2df386fa086d8]
# 
============================================================
--- conf/bitbake.conf	913268fdd4af9c8f090f039d3c1dfe172bb3b59f
+++ conf/bitbake.conf	6eb2dc8d0201f633066436d2ca7e95bb6959844f
@@ -168,6 +168,7 @@ STAGING_LIBDIR = "${STAGING_DIR}/${HOST_
 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"
============================================================
--- packages/ncurses/ncurses.inc	da4a903e1de796a50285b8e65823d214d89d2ea9
+++ packages/ncurses/ncurses.inc	689c6691a65c3ebf75e0f00795ee5f1ea3c348d0
@@ -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
 
============================================================
--- packages/ncurses/ncurses_5.4.bb	b3e5f45623a8c35ae179e1aa93ca97b484fe83a9
+++ packages/ncurses/ncurses_5.4.bb	72e763fb5ea691972f152eeaf0b2df386fa086d8
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
 	   file://visibility.patch;patch=1"