mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-25 07:36:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

ncurses: use lnr instead of python code

Browse Source 
Drop the use of custom Python code and instead use the new lnr script to
generate relative symlinks.

(From OE-Core rev: efe328d3713f60257358cab5d7c6a1d38d1a8d88)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2014-03-03 20:23:35 +00:00
committed by Richard Purdie
parent 1412dda560
commit 2de0100e46
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
meta/recipes-core/ncurses/ncurses.inc
View File

@@ -147,12 +147,7 @@ _install_cfgs = "\
PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
" "
python do_install () { 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' # Order of installation is important; widec installs a 'curses.h'
# header with more definitions and must be installed last hence. # header with more definitions and must be installed last hence.
# Compatibility of these headers will be checked in 'do_test()'. # 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} mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
rm ${D}${libdir}/libtinfo.so 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 fi
oe_multilib_header curses.h oe_multilib_header curses.h