d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to use libedit instead of readline

Browse Source
This commit is contained in:
Baptiste Daroussin 2018-02-06 12:12:44 +00:00
parent a273973175
commit 15c36a23a1
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/usr.bin/gdb/Makefile.inc
View File

@ -13,11 +13,9 @@ BMAKE_BU= ${BMAKE_ROOT}/binutils
CNTRB_BU= ${SRCTOP}/contrib/binutils CNTRB_BU= ${SRCTOP}/contrib/binutils
CNTRB_GDB= ${SRCTOP}/contrib/gdb CNTRB_GDB= ${SRCTOP}/contrib/gdb
CNTRB_RL= ${SRCTOP}/contrib/libreadline
OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils
OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb
OBJ_RL= ${OBJTOP}/gnu/lib/libreadline/readline
# These assignments duplicate much of the functionality of # These assignments duplicate much of the functionality of
# MACHINE_CPUARCH, but there's no easy way to export make functions... # 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 \ .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \
${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} ${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+= -DDEBUGDIR=\"${DEBUGDIR}\"
CFLAGS+= -I. CFLAGS+= -I.
CFLAGS+= -I${TARGET_SUBDIR} CFLAGS+= -I${TARGET_SUBDIR}
@ -47,7 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_BU}/include
CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_GDB}/include
CFLAGS+= -I${CNTRB_BU}/bfd CFLAGS+= -I${CNTRB_BU}/bfd
CFLAGS+= -I${OBJ_RL:H} CFLAGS+= -I${SRCTOP}/lib/libedit/edit
GENSRCS+= nm.h tm.h GENSRCS+= nm.h tm.h

2
gnu/usr.bin/gdb/gdb/Makefile
View File

@ -13,7 +13,7 @@ LDFLAGS+= -Wl,-E
DPADD= ${GDBLIBS} ${BULIBS} DPADD= ${GDBLIBS} ${BULIBS}
LDADD= ${GDBLIBS} ${BULIBS} LDADD= ${GDBLIBS} ${BULIBS}
LIBADD+= m readline ncursesw gnuregex LIBADD+= m edit ncursesw gnuregex
.include <bsd.prog.mk> .include <bsd.prog.mk>
CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\"

2
gnu/usr.bin/gdb/kgdb/Makefile
View File

@ -10,6 +10,6 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
DPADD= ${GDBLIBS} ${BULIBS} DPADD= ${GDBLIBS} ${BULIBS}
LDADD= ${GDBLIBS} ${BULIBS} LDADD= ${GDBLIBS} ${BULIBS}
LIBADD+= m readline ncursesw gnuregex kvm LIBADD+= m edit ncursesw gnuregex kvm
.include <bsd.prog.mk> .include <bsd.prog.mk>