summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-03-03 20:23:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:58:45 +0000
commit2de0100e469c3fcf83254f5e17930681b9b7db12 (patch)
treefc9be30c863587df0c71ad5403211ad1b0a86596 /meta/recipes-core
parent1412dda5609a544d46f4b67bd3a27bbe2c7f4fea (diff)
downloadpoky-2de0100e469c3fcf83254f5e17930681b9b7db12.tar.gz
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. (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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc14
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index a94466a634..f0a4044345 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -147,12 +147,7 @@ _install_cfgs = "\
147 PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ 147 PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
148" 148"
149 149
150python do_install () { 150do_install() {
151 bb.build.exec_func("shell_do_install", d)
152 oe.path.make_relative_symlink(d.expand("${D}${libdir}/libtinfo.so"))
153}
154
155shell_do_install() {
156 # Order of installation is important; widec installs a 'curses.h' 151 # Order of installation is important; widec installs a 'curses.h'
157 # header with more definitions and must be installed last hence. 152 # header with more definitions and must be installed last hence.
158 # Compatibility of these headers will be checked in 'do_test()'. 153 # Compatibility of these headers will be checked in 'do_test()'.
@@ -226,8 +221,11 @@ shell_do_install() {
226 221
227 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} 222 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
228 rm ${D}${libdir}/libtinfo.so 223 rm ${D}${libdir}/libtinfo.so
229 # We'll turn this into a relative symlink after do_install returns 224
230 ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so 225 # Use lnr to ensure this is a relative link despite absolute paths
226 # (as we can't know the relationship between base_libdir and libdir).
227 # At some point we can rely on coreutils 8.16 which has ln -r.
228 lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
231 fi 229 fi
232 230
233 oe_multilib_header curses.h 231 oe_multilib_header curses.h