svn commit: r358112 - in stable/12: contrib/gdb/gdb contrib/gdb/gdb/cli gnu/usr.bin/gdb gnu/usr.bin/gdb/kgdb

[Baptiste Daroussin]

Author: bapt
Date: Wed Feb 19 14:42:21 2020
New Revision: 358112
URL: https://svnweb.freebsd.org/changeset/base/358112

Log:
  MFC r352242, r352249
  
  r352242:
  Remove usesless readline compat includes which will reinclude readline.h
  itself.
  
  This simplifies the upcoming update to newer libedit.
  
  r352249:
  Get the readline header from the installed header instead of the from the source
  location.

Modified:
  stable/12/contrib/gdb/gdb/cli/cli-cmds.c
  stable/12/contrib/gdb/gdb/cli/cli-setshow.c
  stable/12/contrib/gdb/gdb/event-top.c
  stable/12/contrib/gdb/gdb/top.c
  stable/12/contrib/gdb/gdb/tracepoint.c
  stable/12/gnu/usr.bin/gdb/Makefile.inc
  stable/12/gnu/usr.bin/gdb/kgdb/trgt.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/contrib/gdb/gdb/cli/cli-cmds.c
==============================================================================
--- stable/12/contrib/gdb/gdb/cli/cli-cmds.c	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/contrib/gdb/gdb/cli/cli-cmds.c	Wed Feb 19 14:42:21 2020	(r358112)
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include "readline/readline.h"
-#include "readline/tilde.h"
 #include "completer.h"
 #include "target.h"	 /* For baud_rate, remote_debug and remote_timeout */
 #include "gdb_wait.h"		/* For shell escape implementation */

Modified: stable/12/contrib/gdb/gdb/cli/cli-setshow.c
==============================================================================
--- stable/12/contrib/gdb/gdb/cli/cli-setshow.c	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/contrib/gdb/gdb/cli/cli-setshow.c	Wed Feb 19 14:42:21 2020	(r358112)
@@ -18,7 +18,6 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include "readline/tilde.h"
 #include "value.h"
 #include <ctype.h>
 #include "gdb_string.h"

Modified: stable/12/contrib/gdb/gdb/event-top.c
==============================================================================
--- stable/12/contrib/gdb/gdb/event-top.c	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/contrib/gdb/gdb/event-top.c	Wed Feb 19 14:42:21 2020	(r358112)
@@ -34,7 +34,6 @@
 
 /* readline include files */
 #include "readline/readline.h"
-#include "readline/history.h"
 
 /* readline defines this.  */
 #undef savestring

Modified: stable/12/contrib/gdb/gdb/top.c
==============================================================================
--- stable/12/contrib/gdb/gdb/top.c	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/contrib/gdb/gdb/top.c	Wed Feb 19 14:42:21 2020	(r358112)
@@ -48,7 +48,6 @@
 
 /* readline include files */
 #include "readline/readline.h"
-#include "readline/history.h"
 
 /* readline defines this.  */
 #undef savestring

Modified: stable/12/contrib/gdb/gdb/tracepoint.c
==============================================================================
--- stable/12/contrib/gdb/gdb/tracepoint.c	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/contrib/gdb/gdb/tracepoint.c	Wed Feb 19 14:42:21 2020	(r358112)
@@ -45,7 +45,6 @@
 
 /* readline include files */
 #include "readline/readline.h"
-#include "readline/history.h"
 
 /* readline defines this.  */
 #undef savestring

Modified: stable/12/gnu/usr.bin/gdb/Makefile.inc
==============================================================================
--- stable/12/gnu/usr.bin/gdb/Makefile.inc	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/gnu/usr.bin/gdb/Makefile.inc	Wed Feb 19 14:42:21 2020	(r358112)
@@ -45,7 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
 CFLAGS+= -I${CNTRB_BU}/include
 CFLAGS+= -I${CNTRB_GDB}/include
 CFLAGS+= -I${CNTRB_BU}/bfd
-CFLAGS+= -I${SRCTOP}/lib/libedit/edit
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit
 
 GENSRCS+= nm.h tm.h
 

Modified: stable/12/gnu/usr.bin/gdb/kgdb/trgt.c
==============================================================================
--- stable/12/gnu/usr.bin/gdb/kgdb/trgt.c	Wed Feb 19 14:40:53 2020	(r358111)
+++ stable/12/gnu/usr.bin/gdb/kgdb/trgt.c	Wed Feb 19 14:42:21 2020	(r358112)
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include <defs.h>
 #include <readline/readline.h>
-#include <readline/tilde.h>
 #include <command.h>
 #include <exec.h>
 #include <frame-unwind.h>