From 6102726147a6e81fd7ec209db14337055a99b84b Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 7 Nov 2015 23:31:46 -0800
Subject: Change ncurses to a companion library.

Currently, builds for build and target (matching the current
implementation). Need to add building for host for canadian crosses.

TIC_PATH is removed - configure in ncurses searches $PATH, so it finds
'tic' in buildtools anyway. Arguably unneeded code for MacOS also
removed, with a FIXME comment for validation by someone using MacOS.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 config/companion_libs.in         | 17 +++++++++++++++++
 config/companion_libs/ncurses.in | 19 +++++++++++++++++++
 config/debug/gdb.in.native       |  1 +
 3 files changed, 37 insertions(+)
 create mode 100644 config/companion_libs/ncurses.in

(limited to 'config')

diff --git a/config/companion_libs.in b/config/companion_libs.in
index 2847f179..3567512c 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -58,6 +58,11 @@ config EXPAT_NEEDED
     select EXPAT
     select COMPLIBS_NEEDED
 
+config NCURSES_NEEDED
+    bool
+    select NCURSES
+    select COMPLIBS_NEEDED
+
 config COMPLIBS
     bool
 
@@ -113,6 +118,13 @@ config EXPAT
 config EXPAT_TARGET
     bool
 
+config NCURSES
+    bool
+    select COMPLIBS
+
+config NCURSES_TARGET
+    bool
+
 if LIBICONV
 source "config/companion_libs/libiconv.in"
 endif
@@ -147,6 +159,11 @@ comment "expat version needed to build for target"
     depends on !EXPAT
 source "config/companion_libs/expat.in"
 endif
+if NCURSES || NCURSES_TARGET
+comment "ncurses version needed to build for target"
+    depends on !NCURSES
+source "config/companion_libs/ncurses.in"
+endif
 
 if COMPLIBS
 
diff --git a/config/companion_libs/ncurses.in b/config/companion_libs/ncurses.in
new file mode 100644
index 00000000..550cdc05
--- /dev/null
+++ b/config/companion_libs/ncurses.in
@@ -0,0 +1,19 @@
+# expat config file
+
+choice
+    bool
+    prompt "ncurses version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config NCURSES_V_5_9
+    bool
+    prompt "5.9"
+
+endchoice
+
+config NCURSES_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "5.9" if NCURSES_V_5_9
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index 4f7e96a0..1861506b 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -6,6 +6,7 @@ config GDB_NATIVE
     depends on ! BARE_METAL
     depends on ! BACKEND
     select EXPAT_TARGET
+    select NCURSES_TARGET
     help
       Build and install a native gdb for the target, to run on the target.
 
-- 
cgit v1.2.3