From a273973175e2a4cbbda3fd7b8cddd0bec0857082 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Tue, 6 Feb 2018 11:54:20 +0000 Subject: [PATCH] Remove gdbtui, it was already not installed on every arches only installed on arm and sparc64. It is the only bits that keeps us having libreadline in base The rest of gdb can be switched to libedit and will be in another commit --- ObsoleteFiles.inc | 3 ++- gnu/usr.bin/gdb/Makefile | 2 -- gnu/usr.bin/gdb/gdbtui/Makefile | 19 ---------------- gnu/usr.bin/gdb/gdbtui/Makefile.depend | 25 --------------------- targets/pseudo/userland/gnu/Makefile.depend | 1 - tools/build/mk/OptionalObsoleteFiles.inc | 1 - 6 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 gnu/usr.bin/gdb/gdbtui/Makefile delete mode 100644 gnu/usr.bin/gdb/gdbtui/Makefile.depend diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a79ccc022357..54287bce7fdc 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,10 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20180206: remove gdbtui +OLD_FILES+=usr/bin/gdbtui # 20180201: Obsolete forth files OLD_FILES+=boot/efi.4th OLD_FILES+=boot/pcibios.4th - # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0. OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile index 7598a196300a..c9564c232a3c 100644 --- a/gnu/usr.bin/gdb/Makefile +++ b/gnu/usr.bin/gdb/Makefile @@ -5,8 +5,6 @@ SUBDIR= libgdb gdb kgdb .if ${MK_GDB_LIBEXEC} == "no" -SUBDIR+= gdbtui - .if exists(${.CURDIR}/gdbserver/reg-${MACHINE_CPUARCH}.c) SUBDIR+=gdbserver .endif diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile deleted file mode 100644 index 7912d04ec9fa..000000000000 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $FreeBSD$ - -PROG= gdbtui${GDB_SUFFIX} -SRCS= tui-main.c -MAN= - -BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ - ${OBJ_BU}/libiberty/libiberty.a -GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a - -# libthread_db.so calls back into gdb for the proc services. Make all the -# global symbols visible. -LDFLAGS+= -Wl,-E - -DPADD= ${GDBLIBS} ${BULIBS} -LDADD= ${GDBLIBS} ${BULIBS} -LIBADD+= m readline ncursesw gnuregex - -.include diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile.depend b/gnu/usr.bin/gdb/gdbtui/Makefile.depend deleted file mode 100644 index ee6269e741a7..000000000000 --- a/gnu/usr.bin/gdb/gdbtui/Makefile.depend +++ /dev/null @@ -1,25 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - gnu/lib/libreadline/readline \ - gnu/lib/libregex \ - gnu/usr.bin/binutils/libbfd \ - gnu/usr.bin/binutils/libiberty \ - gnu/usr.bin/binutils/libopcodes \ - gnu/usr.bin/gdb/libgdb \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - lib/msun \ - lib/ncurses/ncursesw \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend index e42e2d628b32..b67e02d6ab03 100644 --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/targets/pseudo/userland/gnu/Makefile.depend @@ -32,7 +32,6 @@ DIRDEPS = \ gnu/usr.bin/gdb/doc \ gnu/usr.bin/gdb/gdb \ gnu/usr.bin/gdb/gdbserver \ - gnu/usr.bin/gdb/gdbtui \ gnu/usr.bin/gdb/kgdb \ gnu/usr.bin/gdb/libgdb \ gnu/usr.bin/gperf \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index e4e56f28202a..e1ef3d30a0cb 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2460,7 +2460,6 @@ OLD_FILES+=usr/share/man/man1/gcov.1.gz .if ${MK_GDB} == no || ${MK_GDB_LIBEXEC} == yes OLD_FILES+=usr/bin/gdb OLD_FILES+=usr/bin/gdbserver -OLD_FILES+=usr/bin/gdbtui OLD_FILES+=usr/bin/kgdb OLD_FILES+=usr/share/man/man1/gdb.1.gz OLD_FILES+=usr/share/man/man1/gdbserver.1.gz