ncurses.inc: add v6 binconfig-disabled entries

PATCH New Trevor Woerner 1 participant 1 message Dec 20, 2016

Share & tools

Trevor Woerner

author

2016-12-20 16:12 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 meta/classes/binconfig-disabled.bbclass | 1 +
 meta/recipes-core/ncurses/ncurses.inc   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

meta/classes/binconfig-disabled.bbclass +1 -0

index 602a669..096b670 100644
@@ -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
 }

meta/recipes-core/ncurses/ncurses.inc +4 -1

index ff0117b..3f4bf67 100644
@@ -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 \
 "

Signature · 1 line

2.10.2