Patchwork [CONSOLIDATED,PULL,17/17] ncurses: libcurses.so should link to libncurses.so

login
mail settings
Submitter Saul Wold
Date Dec. 8, 2011, 8:44 a.m.
Message ID <744c3cb0900eecc34b50195a9c1eb89d616f33cc.1323333676.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/16497/
State New
Headers show

Comments

Saul Wold - Dec. 8, 2011, 8:44 a.m.
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>
---
 meta/recipes-core/ncurses/ncurses.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Phil Blundell - Dec. 8, 2011, 11:33 a.m.
On Thu, 2011-12-08 at 00:44 -0800, Saul Wold wrote:
> +	ln -s ${D}${libdir}/libncurses.so ${D}${libdir}/libcurses.so

That looks a bit dubious.  Is that ${D} really correct there?

p.

Patch

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index df9252a..54876ca 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,10 @@  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.
+	rm -f ${D}${libdir}/libcurses.so
+	ln -s ${D}${libdir}/libncurses.so ${D}${libdir}/libcurses.so
 
         # create libtermcap.so linker script for backward compatibility
         f=${D}${libdir}/libtermcap.so