diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2018-03-09 14:00:05 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-15 03:38:46 -0700 |
| commit | 17fd322e925cf492b22c75e296d5fee31e3511db (patch) | |
| tree | 9c288d977db674e9f53888c0de5ffd3f44bee224 | |
| parent | e58d5521c7bae8daafdac85754545be176550a02 (diff) | |
| download | openembedded-core-contrib-17fd322e925cf492b22c75e296d5fee31e3511db.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 106dcb016e1..0bfd644d18f 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 |