diff options
| author | Saul Wold <sgw@linux.intel.com> | 2011-12-07 12:00:03 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-12 21:50:14 +0000 |
| commit | 1d2908d910617b37b58f1d1d4d0871bb1e774cfe (patch) | |
| tree | 4a138ae9bb8bb026d5e88d89e22ded5d8ffe32e9 | |
| parent | bbc8afb2e20fad083c40c614a79e68b7fdfc5f89 (diff) | |
| download | poky-1d2908d910617b37b58f1d1d4d0871bb1e774cfe.tar.gz | |
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.
(From OE-Core rev: 6e3a0c0eb6938f3f04fb42784fe1744f30762d3b)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 5 |
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 | |||
| 6 | SECTION = "libs" | 6 | SECTION = "libs" |
| 7 | DEPENDS = "ncurses-native" | 7 | DEPENDS = "ncurses-native" |
| 8 | DEPENDS_virtclass-native = "" | 8 | DEPENDS_virtclass-native = "" |
| 9 | INC_PR = "r2" | 9 | INC_PR = "r3" |
| 10 | 10 | ||
| 11 | inherit autotools binconfig multilib_header | 11 | inherit autotools binconfig multilib_header |
| 12 | 12 | ||
| @@ -161,6 +161,9 @@ do_install() { | |||
| 161 | echo '/* GNU ld script */' >$f | 161 | echo '/* GNU ld script */' >$f |
| 162 | echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f | 162 | echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f |
| 163 | done | 163 | done |
| 164 | # Make sure that libcurses is linked so that it gets -ltinfo | ||
| 165 | # also, this should be addressed upstream really. | ||
| 166 | ln -sf libncurses.so ${D}${libdir}/libcurses.so | ||
| 164 | 167 | ||
| 165 | # create libtermcap.so linker script for backward compatibility | 168 | # create libtermcap.so linker script for backward compatibility |
| 166 | f=${D}${libdir}/libtermcap.so | 169 | f=${D}${libdir}/libtermcap.so |
