diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-03 15:52:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-03 15:55:27 +0000 |
commit | f03955041d0e44d377ca1c4def630982f24f1e8b (patch) | |
tree | c3f8645a38e3a4426e173766da0c7f3156e18150 /meta/recipes-core | |
parent | 54c2e993ec129563c7ae9f3fdee74ab60da28698 (diff) | |
download | openembedded-core-contrib-f03955041d0e44d377ca1c4def630982f24f1e8b.tar.gz |
Revert "ncurses: use ln -r to generate relative symlink"
ln -r isn't available in older versions of coreutils such as those
present in Ubuntu 12.04. We'll find an alternative solution.
This reverts commit 65c2439ab6dcbd4c52439cdc96acb8ba222c196b.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 835ecc33e8..a94466a634 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -147,7 +147,12 @@ _install_cfgs = "\ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ " -do_install() { +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() { # 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()'. @@ -221,7 +226,8 @@ do_install() { mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} rm ${D}${libdir}/libtinfo.so - ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${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 fi oe_multilib_header curses.h |