svn commit: r328926 - in head/gnu/usr.bin/gdb: . gdb kgdb

[Baptiste Daroussin]

Author: bapt
Date: Tue Feb  6 12:12:44 2018
New Revision: 328926
URL: https://svnweb.freebsd.org/changeset/base/328926

Log:
  Switch to use libedit instead of readline

Modified:
  head/gnu/usr.bin/gdb/Makefile.inc
  head/gnu/usr.bin/gdb/gdb/Makefile
  head/gnu/usr.bin/gdb/kgdb/Makefile

Modified: head/gnu/usr.bin/gdb/Makefile.inc
==============================================================================
--- head/gnu/usr.bin/gdb/Makefile.inc	Tue Feb  6 11:54:20 2018	(r328925)
+++ head/gnu/usr.bin/gdb/Makefile.inc	Tue Feb  6 12:12:44 2018	(r328926)
@@ -13,11 +13,9 @@ BMAKE_BU= ${BMAKE_ROOT}/binutils
 
 CNTRB_BU= ${SRCTOP}/contrib/binutils
 CNTRB_GDB= ${SRCTOP}/contrib/gdb
-CNTRB_RL= ${SRCTOP}/contrib/libreadline
 
 OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils
 OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb
-OBJ_RL= ${OBJTOP}/gnu/lib/libreadline/readline
 
 # These assignments duplicate much of the functionality of
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
@@ -37,7 +35,7 @@ GDB_CROSS_DEBUGGER=
 .PATH:	${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi	\
 	${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR}
 
-CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1
+CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1
 CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\"
 CFLAGS+= -I.
 CFLAGS+= -I${TARGET_SUBDIR}
@@ -47,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${OBJ_RL:H}
+CFLAGS+= -I${SRCTOP}/lib/libedit/edit
 
 GENSRCS+= nm.h tm.h
 

Modified: head/gnu/usr.bin/gdb/gdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/gdb/Makefile	Tue Feb  6 11:54:20 2018	(r328925)
+++ head/gnu/usr.bin/gdb/gdb/Makefile	Tue Feb  6 12:12:44 2018	(r328926)
@@ -13,7 +13,7 @@ LDFLAGS+= -Wl,-E
 
 DPADD=	${GDBLIBS} ${BULIBS}
 LDADD=	${GDBLIBS} ${BULIBS}
-LIBADD+=	m readline ncursesw gnuregex
+LIBADD+=	m edit ncursesw gnuregex
 
 .include <bsd.prog.mk>
 CFLAGS+=	-DDEBUGDIR=\"${DEBUGDIR}\"

Modified: head/gnu/usr.bin/gdb/kgdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/kgdb/Makefile	Tue Feb  6 11:54:20 2018	(r328925)
+++ head/gnu/usr.bin/gdb/kgdb/Makefile	Tue Feb  6 12:12:44 2018	(r328926)
@@ -10,6 +10,6 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
 DPADD=	${GDBLIBS} ${BULIBS}
 LDADD=	${GDBLIBS} ${BULIBS}
-LIBADD+=	m readline ncursesw gnuregex kvm
+LIBADD+=	m edit ncursesw gnuregex kvm
 
 .include <bsd.prog.mk>