Merge pull request #249 from stilor/expat_ncurses

Promote expat/ncurses to 'companion libs'

5 files changed, 76 insertions, 3 deletions

diff --git a/config/companion_libs.in b/config/companion_libs.in
index 0b0177c3..3567512c 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -53,6 +53,16 @@ config LIBELF_NEEDED
     select LIBELF
     select COMPLIBS_NEEDED
 
+config EXPAT_NEEDED
+    bool
+    select EXPAT
+    select COMPLIBS_NEEDED
+
+config NCURSES_NEEDED
+    bool
+    select NCURSES
+    select COMPLIBS_NEEDED
+
 config COMPLIBS
     bool
 
@@ -101,6 +111,20 @@ config LIBELF
 config LIBELF_TARGET
     bool
 
+config EXPAT
+    bool
+    select COMPLIBS
+
+config EXPAT_TARGET
+    bool
+
+config NCURSES
+    bool
+    select COMPLIBS
+
+config NCURSES_TARGET
+    bool
+
 if LIBICONV
 source "config/companion_libs/libiconv.in"
 endif
@@ -130,9 +154,16 @@ comment "libelf version needed to build for target"
     depends on !LIBELF
 source "config/companion_libs/libelf.in"
 endif
-
-config FOO
-    bool
+if EXPAT || EXPAT_TARGET
+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/expat.in b/config/companion_libs/expat.in
new file mode 100644
index 00000000..1dff4a79
--- /dev/null
+++ b/config/companion_libs/expat.in
@@ -0,0 +1,19 @@
+# expat config file
+
+choice
+    bool
+    prompt "expat version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config EXPAT_V_2_1_0
+    bool
+    prompt "2.1.0"
+
+endchoice
+
+config EXPAT_VERSION
+    string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+    default "2.1.0" if EXPAT_V_2_1_0
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.cross b/config/debug/gdb.in.cross
index 549cba23..99c9825e 100644
--- a/config/debug/gdb.in.cross
+++ b/config/debug/gdb.in.cross
@@ -8,6 +8,8 @@ config GDB_CROSS
     prompt "Cross-gdb"
     default y
     select GDB_GDBSERVER if ! BARE_METAL
+    select EXPAT_NEEDED
+    select NCURSES_NEEDED
     help
       Build and install a cross-gdb for the target, to run on host.
 
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index 8d2159af..1861506b 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -5,6 +5,8 @@ config GDB_NATIVE
     prompt "Native gdb"
     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.