summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-07 12:00:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-12 21:50:07 +0000
commit6e3a0c0eb6938f3f04fb42784fe1744f30762d3b (patch)
tree922d5080c98863f25ba80b35bb3b174a8ccddf4f
parentc9a420be15d54a8494cb45d6c932b86895e94e13 (diff)
downloadopenembedded-core-6e3a0c0eb6938f3f04fb42784fe1744f30762d3b.tar.gz
openembedded-core-6e3a0c0eb6938f3f04fb42784fe1744f30762d3b.tar.bz2
openembedded-core-6e3a0c0eb6938f3f04fb42784fe1744f30762d3b.zip
ncurses: libcurses.so should link to libncurses.so
The current libcurses (backward compat) links to libncurses.so.5.9, this causes a problem since this library also needs libtinfo, the libncurses.so, uses a "ld script" to include both, libcurses.so should point to libncurses.so (the script) not the library. Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index df9252a03b..98f45a4334 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r2"
+INC_PR = "r3"
inherit autotools binconfig multilib_header
@@ -161,6 +161,9 @@ do_install() {
echo '/* GNU ld script */' >$f
echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f
done
+ # Make sure that libcurses is linked so that it gets -ltinfo
+ # also, this should be addressed upstream really.
+ ln -sf libncurses.so ${D}${libdir}/libcurses.so
# create libtermcap.so linker script for backward compatibility
f=${D}${libdir}/libtermcap.so