diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2018-03-09 14:00:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-23 17:43:00 +0100 |
commit | ccefb1eb89dd914c128d9fb6d49c8c7304ba47c5 (patch) | |
tree | d6eafc5a3b180db30746523e8841005a208ef820 /meta/recipes-core | |
parent | 2cbdd486723327c8f7cef562100446e6a2dda54b (diff) | |
download | poky-ccefb1eb89dd914c128d9fb6d49c8c7304ba47c5.tar.gz |
ncurses: fix deletion of /usr/lib/terminfo
Ncurses doesn't honour ${libdir} for terminfo, so try more options to remove it.
(From OE-Core rev: 17fd322e925cf492b22c75e296d5fee31e3511db)
(From OE-Core rev: 3d07d4a1e8a7324437e2f37ffcafbb032a086008)
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 5bd5c0e58d..8753852719 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -201,7 +201,10 @@ do_install() { | |||
201 | ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm | 201 | ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm |
202 | fi | 202 | fi |
203 | 203 | ||
204 | rm -f ${D}${libdir}/terminfo | 204 | # When changing ${libdir} to e.g. /usr/lib/myawesomelib/ ncurses |
205 | # still installs '/usr/lib/terminfo', so try to rm both | ||
206 | # the proper path and a slightly hardcoded one | ||
207 | rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo | ||
205 | 208 | ||
206 | # create linker scripts for libcurses.so and libncurses to | 209 | # create linker scripts for libcurses.so and libncurses to |
207 | # link against -ltinfo when needed. Some builds might break | 210 | # link against -ltinfo when needed. Some builds might break |