aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ncurses
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-02-28 18:28:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-01 16:04:18 +0000
commit65c2439ab6dcbd4c52439cdc96acb8ba222c196b (patch)
tree8b528dd05036232ab4c18d6c1bf8e441a908d672 /meta/recipes-core/ncurses
parent361d334cabdeb9f25788e9f4b84e8cf7b28d26d3 (diff)
downloadopenembedded-core-contrib-65c2439ab6dcbd4c52439cdc96acb8ba222c196b.tar.gz
openembedded-core-contrib-65c2439ab6dcbd4c52439cdc96acb8ba222c196b.tar.bz2
openembedded-core-contrib-65c2439ab6dcbd4c52439cdc96acb8ba222c196b.zip
ncurses: use ln -r to generate relative symlink
Instead of using a Python do_install() and calling oe.path.make_relative_symlink, just pass -r to ln to generate a relative symlink directly. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ncurses')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc10
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index a94466a634..835ecc33e8 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,7 @@ 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
+ ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
fi
oe_multilib_header curses.h