diff options
| author | Trevor Woerner <twoerner@gmail.com> | 2016-12-20 11:11:58 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-22 08:46:38 +0000 |
| commit | 0174152272c546dd6cb6bc4b7238c232ab9133b3 (patch) | |
| tree | 65df44c3a9ec606973693c50b0911015f8618578 | |
| parent | 6c990655e35bb3a14d59555662ec5802c9980028 (diff) | |
| download | openembedded-core-0174152272c546dd6cb6bc4b7238c232ab9133b3.tar.gz openembedded-core-0174152272c546dd6cb6bc4b7238c232ab9133b3.tar.bz2 openembedded-core-0174152272c546dd6cb6bc4b7238c232ab9133b3.zip | |
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@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/binconfig-disabled.bbclass | 1 | ||||
| -rw-r--r-- | meta/recipes-core/ncurses/ncurses.inc | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/binconfig-disabled.bbclass b/meta/classes/binconfig-disabled.bbclass index 602a669aa1..096b670e12 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 ff0117b822..3f4bf67aa9 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 \ " |