aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ncurses
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-03-03 20:23:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:57:39 +0000
commitefe328d3713f60257358cab5d7c6a1d38d1a8d88 (patch)
treec58de71b913f9f2f0114efce2cb428c0fc5b50c1 /meta/recipes-core/ncurses
parent6ae3b85eaffd1b0b6914422e8de7c1230723157d (diff)
downloadopenembedded-core-contrib-efe328d3713f60257358cab5d7c6a1d38d1a8d88.tar.gz
openembedded-core-contrib-efe328d3713f60257358cab5d7c6a1d38d1a8d88.tar.bz2
openembedded-core-contrib-efe328d3713f60257358cab5d7c6a1d38d1a8d88.zip
ncurses: use lnr instead of python code
Drop the use of custom Python code and instead use the new lnr script to generate relative symlinks. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/ncurses')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc14
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index a94466a634..f0a4044345 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -147,12 +147,7 @@ _install_cfgs = "\
PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
"
-python do_install () {
- bb.build.exec_func("shell_do_install", d)
- oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
-}
-
-shell_do_install() {
+do_install() {
# Order of installation is important; widec installs a 'curses.h'
# header with more definitions and must be installed last hence.
# Compatibility of these headers will be checked in 'do_test()'.
@@ -226,8 +221,11 @@ shell_do_install() {
mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
rm ${D}${libdir}/libtinfo.so
- # We'll turn this into a relative symlink after do_install returns
- ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
+
+ # Use lnr to ensure this is a relative link despite absolute paths
+ # (as we can't know the relationship between base_libdir and libdir).
+ # At some point we can rely on coreutils 8.16 which has ln -r.
+ lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
fi
oe_multilib_header curses.h