aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ncurses
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2018-03-09 14:00:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 03:38:46 -0700
commit17fd322e925cf492b22c75e296d5fee31e3511db (patch)
tree9c288d977db674e9f53888c0de5ffd3f44bee224 /meta/recipes-core/ncurses
parente58d5521c7bae8daafdac85754545be176550a02 (diff)
downloadopenembedded-core-contrib-17fd322e925cf492b22c75e296d5fee31e3511db.tar.gz
openembedded-core-contrib-17fd322e925cf492b22c75e296d5fee31e3511db.tar.bz2
openembedded-core-contrib-17fd322e925cf492b22c75e296d5fee31e3511db.zip
ncurses: fix deletion of /usr/lib/terminfo
Ncurses doesn't honour ${libdir} for terminfo, so try more options to remove it. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/ncurses')
-rw-r--r--meta/recipes-core/ncurses/ncurses.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 106dcb016e..0bfd644d18 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -201,7 +201,10 @@ do_install() {
ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
fi
- rm -f ${D}${libdir}/terminfo
+ # When changing ${libdir} to e.g. /usr/lib/myawesomelib/ ncurses
+ # still installs '/usr/lib/terminfo', so try to rm both
+ # the proper path and a slightly hardcoded one
+ rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo
# create linker scripts for libcurses.so and libncurses to
# link against -ltinfo when needed. Some builds might break