[oe-commits] [openembedded-core] 03/05: ncurses: fix deletion of /usr/lib/terminfo

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 3d07d4a1e8a7324437e2f37ffcafbb032a086008
Author: Koen Kooi <koen at dominion.thruhere.net>
AuthorDate: Fri Mar 9 14:00:05 2018 +0100

    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)
    
    Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-core/ncurses/ncurses.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index 5bd5c0e..8753852 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.