[oe-commits] [openembedded-core] 25/25: ncurses.inc: add v6 binconfig-disabled entries

git at git.openembedded.org git at git.openembedded.org
Thu Dec 22 08:51:13 UTC 2016


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

commit 0174152272c546dd6cb6bc4b7238c232ab9133b3
Author: Trevor Woerner <twoerner at gmail.com>
AuthorDate: Tue Dec 20 11:11:58 2016 -0500

    ncurses.inc: add v6 binconfig-disabled entries
    
    Newer host distributions are moving to ncurses6, therefore add entries so the
    host's ncurses{w}6-config scripts aren't picked up.
    
    Signed-off-by: Trevor Woerner <twoerner at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/binconfig-disabled.bbclass | 1 +
 meta/recipes-core/ncurses/ncurses.inc   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/binconfig-disabled.bbclass b/meta/classes/binconfig-disabled.bbclass
index 602a669..096b670 100644
--- a/meta/classes/binconfig-disabled.bbclass
+++ b/meta/classes/binconfig-disabled.bbclass
@@ -15,6 +15,7 @@ do_install_append () {
 		echo "echo 'ERROR: $x should not be used, use an alternative such as pkg-config' >&2" >> ${D}$x
 		echo "echo '--should-not-have-used-$x'" >> ${D}$x
 		echo "exit 1" >> ${D}$x
+		chmod +x ${D}$x
 	done
 }
 
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ff0117b..3f4bf67 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -7,7 +7,8 @@ SECTION = "libs"
 DEPENDS = "ncurses-native"
 DEPENDS_class-native = ""
 
-BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config"
+BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \
+	${bindir}/ncurses6-config ${bindir}/ncursesw6-config"
 
 inherit autotools binconfig-disabled multilib_header pkgconfig
 
@@ -278,6 +279,8 @@ FILES_${PN} = "\
   ${bindir}/tset \
   ${bindir}/ncurses5-config \
   ${bindir}/ncursesw5-config \
+  ${bindir}/ncurses6-config \
+  ${bindir}/ncursesw6-config \
   ${datadir}/tabset \
 "
 

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


More information about the Openembedded-commits mailing list