[oe-commits] Richard Purdie : Revert "ncurses: use ln -r to generate relative symlink"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 82c773e88aaefd9321481ad297554d5b4a3ae0b2
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=82c773e88aaefd9321481ad297554d5b4a3ae0b2

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Mar  3 15:52:26 2014 +0000

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.

---

 meta/recipes-core/ncurses/ncurses.inc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 835ecc3..a94466a 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