Ticket #4738: haiku_enable_gdbtui.diff

src/bin/gdb/gdb/config-x86/init.c

@@ -103 +103 @@
 extern initialize_file_ftype _initialize_mi_cmd_env;
 extern initialize_file_ftype _initialize_mi_interp;
 extern initialize_file_ftype _initialize_mi_main;
+extern initialize_file_ftype _initialize_tui_hooks;
+extern initialize_file_ftype _initialize_tui_interp;
+extern initialize_file_ftype _initialize_tui_layout;
+extern initialize_file_ftype _initialize_tui_out;
+extern initialize_file_ftype _initialize_tui_regs;
+extern initialize_file_ftype _initialize_tui_stack;
+extern initialize_file_ftype _initialize_tui_win;
 void
 initialize_all_files (void)
 {
@@ -207 +214 @@
   _initialize_mi_cmd_env ();
   _initialize_mi_interp ();
   _initialize_mi_main ();
+  _initialize_tui_hooks ();
+  _initialize_tui_interp ();
+  _initialize_tui_layout ();
+  _initialize_tui_out ();
+  _initialize_tui_regs ();
+  _initialize_tui_stack ();
+  _initialize_tui_win ();
 }

src/bin/gdb/gdb/config-x86/config.h

@@ -310 +310 @@
 #define HAVE_MEMORY_H 1
 
 /* Define if you have the <ncurses.h> header file.  */
-/* #undef HAVE_NCURSES_H */
+#define HAVE_NCURSES_H 1
 
 /* Define if you have the <ncurses/ncurses.h> header file.  */
 /* #undef HAVE_NCURSES_NCURSES_H */

src/bin/gdb/gdb/Jamfile

@@ -10 +10 @@
     # Use gawk's libintl for the time being.
     # TODO: Put a current version of intl ot src/libs and build a static lib
     # all interested apps can link against.
+UseLibraryHeaders ncurses ;
 UsePrivateHeaders debug ;
 
 SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR=\\\"/etc/locale\\\"
-    -DMI_OUT=1 ;
+    -DMI_OUT=1 -DTUI=1 ;
 
 # filter warnings we don't want here
 TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
@@ -22 +23 @@
 SEARCH_SOURCE += [ FDirName $(SUBDIR) cli ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) mi ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) signals ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) tui ] ;
 
 # architecture specific sources
 local gdbHaikuArchTargetSources ;
@@ -215 +217 @@
     mi-symbol-cmds.c
 ;
 
+local gdbTUISources =
+    tui-command.c
+    tui-data.c
+    tui-disasm.c
+    tui-file.c
+    tui-hooks.c
+    tui-interp.c
+    tui-io.c
+    tui-layout.c
+    tui-out.c
+    tui-regs.c
+    tui-source.c
+    tui-stack.c
+    tui-win.c
+    tui-windata.c
+    tui-wingeneral.c
+    tui-winsource.c
+    tui.c
+;
+
 local gdbHaikuTargetSources =
     haiku-tdep.c
     solib.c
@@ -232 +254 @@
     $(gdbBaseSources)
     $(gdbGeneratedSources)
     $(gdbHostSources)
+    $(gdbTUISources)
     $(gdbHaikuTargetSources)
     $(gdbHaikuNativeSources)
     $(gdbHaikuArchTargetSources)
@@ -257 +280 @@
     <gdb>libreadline.a
     <gawk>libintl.a # use gawk's libintl for the time being
 
-    libtermcap.a
+#   libtermcap.a
+    libncurses.a
 
     libroot.so
     libdebug.so