[openwrt/openwrt] prereq-build: use RequireCHeader test for ncurses prereq

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 9 12:25:11 PST 2023


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/848b3445fba43b8ae2e1a299418551d8bc8cd400

commit 848b3445fba43b8ae2e1a299418551d8bc8cd400
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Mon Jan 9 18:40:00 2023 +0100

    prereq-build: use RequireCHeader test for ncurses prereq
    
    RequireCHeader is a generilized version of the ncurses prereq test. Use
    that indetad.
    
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 include/prereq-build.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 9c4ef547ad..7959890eb5 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -49,10 +49,9 @@ $(eval $(call TestHostCommand,working-g++, \
 		g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
 		$(TMP_DIR)/a.out))
 
-$(eval $(call TestHostCommand,ncurses, \
+$(eval $(call RequireCHeader,ncurses.h, \
 	Please install ncurses. (Missing libncurses.so or ncurses.h), \
-	echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
-		gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses))
+	initscr(), -lncurses))
 
 $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
 	git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule, \




More information about the lede-commits mailing list