summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-03 15:52:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-03 15:55:27 +0000
commitf03955041d0e44d377ca1c4def630982f24f1e8b (patch)
treec3f8645a38e3a4426e173766da0c7f3156e18150
parent54c2e993ec129563c7ae9f3fdee74ab60da28698 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc10
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 = "\
147 PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \ 147 PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
148" 148"
149 149
150do_install() { 150python do_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() {
151 # Order of installation is important; widec installs a 'curses.h' 156 # Order of installation is important; widec installs a 'curses.h'
152 # header with more definitions and must be installed last hence. 157 # header with more definitions and must be installed last hence.
153 # Compatibility of these headers will be checked in 'do_test()'. 158 # Compatibility of these headers will be checked in 'do_test()'.
@@ -221,7 +226,8 @@ do_install() {
221 226
222 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir} 227 mv ${D}${libdir}/libtinfo.so.* ${D}${base_libdir}
223 rm ${D}${libdir}/libtinfo.so 228 rm ${D}${libdir}/libtinfo.so
224 ln -rsf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so 229 # We'll turn this into a relative symlink after do_install returns
230 ln -sf ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
225 fi 231 fi
226 232
227 oe_multilib_header curses.h 233 oe_multilib_header curses.h