[oe-commits] Ross Burton : ncurses: use lnr instead of python code
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 7 14:52:29 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: efe328d3713f60257358cab5d7c6a1d38d1a8d88
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=efe328d3713f60257358cab5d7c6a1d38d1a8d88
Author: Ross Burton <ross.burton at intel.com>
Date: Mon Mar 3 20:23:35 2014 +0000
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 at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index a94466a..f0a4044 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
More information about the Openembedded-commits
mailing list