[ptxdist] [PATCH 1/2] bash: use ptx/ifdef and ptx/wwo macros

[ptxdist] [PATCH 1/2] bash: use ptx/ifdef and ptx/wwo macros

[Bastian Krause]

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/bash.make | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/rules/bash.make b/rules/bash.make
index 2a862be13..4abce8323 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -30,8 +30,9 @@ BASH_LICENSE	:= GPL-3.0-only
 # ----------------------------------------------------------------------------
 
 BASH_PATH	:= PATH=$(CROSS_PATH)
-BASH_ENV	:= $(CROSS_ENV)
-
+BASH_ENV	:= \
+	$(CROSS_ENV) \
+	bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, present, missing)
 
 BASH_AUTOCONF	:= \
 	$(CROSS_AUTOCONF_USR) \
@@ -71,15 +72,8 @@ BASH_AUTOCONF	:= \
 	--$(call ptx/endis, PTXCONF_BASH_SEP_HELPFILES)-separate-helpfiles \
 	--$(call ptx/endis, PTXCONF_BASH_SINGLE_HELPLINE)-single-help-strings \
 	--$(call ptx/endis, PTXCONF_BASH_GPROF)-profiling \
-	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link
-
-ifdef PTXCONF_BASH_CURSES
-BASH_AUTOCONF += --with-curses
-endif
-
-ifdef PTXCONF_BASH_JOBS
-BASH_ENV	+= bash_cv_job_control_missing=present
-endif
+	--$(call ptx/endis, PTXCONF_BASH_STATIC)-static-link \
+	--$(call ptx/wwo, PTXCONF_BASH_CURSES)-curses
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] bash: select termcap as alternative for curses

[Bastian Krause]

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/bash.in   | 1 +
 rules/bash.make | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/bash.in b/rules/bash.in
index 4c1e0e12c..183c7517a 100644
--- a/rules/bash.in
+++ b/rules/bash.in
@@ -4,6 +4,7 @@ menuconfig BASH
 	select LIBC_DL
 	select GCCLIBS_GCC_S
 	select NCURSES if BASH_CURSES
+	select TERMCAP if !BASH_CURSES
 	help
 	  The GNU Bourne Again SHell
 	  Bash is an sh-compatible command language interpreter that executes
diff --git a/rules/bash.make b/rules/bash.make
index 4abce8323..e38f1f087 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -32,7 +32,8 @@ BASH_LICENSE	:= GPL-3.0-only
 BASH_PATH	:= PATH=$(CROSS_PATH)
 BASH_ENV	:= \
 	$(CROSS_ENV) \
-	bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, present, missing)
+	bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, present, missing) \
+	bash_cv_termcap_lib=$(call ptx/ifdef, PTXCONF_BASH_CURSES, libncurses, libtermcap)
 
 BASH_AUTOCONF	:= \
 	$(CROSS_AUTOCONF_USR) \
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de