X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdb.git;a=blobdiff_plain;f=gdb-readline.patch;h=42a1e761eaa033375162cbbd96bb89ed48b537b2;hp=47cd0d9834642c29e4d88ff8c104245ccc736d7b;hb=HEAD;hpb=4846758902cc99f342b83bb6837c1af882f52241 diff --git a/gdb-readline.patch b/gdb-readline.patch index 47cd0d9..2bd4c77 100644 --- a/gdb-readline.patch +++ b/gdb-readline.patch @@ -1,168 +1,197 @@ -diff -urN gdb-5.0.org/Makefile.in gdb-5.0/Makefile.in ---- gdb-5.0.org/Makefile.in Thu May 18 07:00:23 2000 -+++ gdb-5.0/Makefile.in Tue Sep 5 18:32:37 2000 -@@ -558,7 +558,6 @@ - all-perl \ - all-prms \ - all-rcs \ -- all-readline \ - all-release \ - all-recode \ - all-sed \ -@@ -631,7 +630,6 @@ - check-perl \ - check-prms \ - check-rcs \ -- check-readline \ - check-recode \ - check-sed \ - check-send-pr \ -@@ -705,7 +703,6 @@ - install-perl \ - install-prms \ - install-rcs \ -- install-readline \ - install-recode \ - install-sed \ - install-send-pr \ -@@ -869,7 +866,6 @@ - clean-perl \ - clean-prms \ - clean-rcs \ -- clean-readline \ - clean-release \ - clean-recode \ - clean-sed \ -@@ -1561,7 +1557,7 @@ - all-gcc: all-bison all-byacc all-binutils all-gas all-ld - all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld - GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui --all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) -+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK) - all-gettext: - all-gnuserv: - configure-target-gperf: $(ALL_GCC) -@@ -1606,12 +1602,11 @@ - all-perl: - all-prms: all-libiberty - all-rcs: --all-readline: - all-recode: all-libiberty - all-sed: all-libiberty - all-send-pr: all-prms - all-shellutils: --all-sim: all-libiberty all-bfd all-opcodes all-readline -+all-sim: all-libiberty all-bfd all-opcodes - all-tar: all-libiberty - all-tcl: - all-tcl8.1: -@@ -1853,7 +1848,7 @@ - SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)" +--- gdb-14.1/gdb/Makefile.in.orig 2022-06-23 22:08:57.971168251 +0200 ++++ gdb-14.1/gdb/Makefile.in 2022-06-23 22:15:34.112355503 +0200 +@@ -180,11 +180,11 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUM + LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC) - .PHONY: gdb.tar.bz2 --GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl -+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes sim utils intl - gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb - $(MAKE) -f Makefile.in gdb-taz TOOL=gdb \ - MD5PROG="$(MD5PROG)" \ -diff -urN gdb-5.0.org/gdb/Makefile.in gdb-5.0/gdb/Makefile.in ---- gdb-5.0.org/gdb/Makefile.in Tue Sep 5 18:30:00 2000 -+++ gdb-5.0/gdb/Makefile.in Tue Sep 5 19:15:00 2000 -@@ -126,10 +126,10 @@ - BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) - - # Where is the READLINE library? Typically in ../readline. --READLINE_DIR = ../readline --READLINE = $(READLINE_DIR)/libreadline.a + # Where is the READLINE library? Typically in ../readline/readline. +-READLINE_DIR = ../readline/readline -READLINE_SRC = $(srcdir)/$(READLINE_DIR) --READLINE_CFLAGS = -I$(READLINE_SRC)/.. +-READLINE = @READLINE@ +-READLINE_DEPS = @READLINE_DEPS@ +-READLINE_CFLAGS = @READLINE_CFLAGS@ +READLINE_DIR = /usr/include/readline +READLINE = -lreadline +READLINE_SRC = /usr/include/readline ++READLINE_DEPS = +READLINE_CFLAGS = -I/usr/include/readline - WARN_CFLAGS = @WARN_CFLAGS@ - WERROR_CFLAGS = @WERROR_CFLAGS@ -diff -urN gdb-5.0.org/gdb/event-top.c gdb-5.0/gdb/event-top.c ---- gdb-5.0.org/gdb/event-top.c Tue Sep 5 19:34:20 2000 -+++ gdb-5.0/gdb/event-top.c Tue Sep 5 19:34:42 2000 -@@ -32,6 +32,7 @@ - #include "gdbcmd.h" - - /* readline include files */ -+#define savestring - #include - #include - -diff -urN gdb-5.0.org/gdb/gdbserver/Makefile.in gdb-5.0/gdb/gdbserver/Makefile.in ---- gdb-5.0.org/gdb/gdbserver/Makefile.in Tue Sep 5 18:30:00 2000 -+++ gdb-5.0/gdb/gdbserver/Makefile.in Tue Sep 5 18:30:35 2000 -@@ -87,7 +87,7 @@ - - # Where is the source dir for the READLINE library? Traditionally in .. or . - # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.) --READLINE_DIR = ${srcdir}/../readline -+READLINE_DIR = /usr/lib - READLINE_DEP = $$(READLINE_DIR) - - # All the includes used for CFLAGS and for lint. -diff -urN gdb-5.0.org/gdb/top.c gdb-5.0/gdb/top.c ---- gdb-5.0.org/gdb/top.c Wed Apr 12 18:46:03 2000 -+++ gdb-5.0/gdb/top.c Tue Sep 5 19:45:56 2000 -@@ -36,6 +36,7 @@ - #include "version.h" - - /* readline include files */ -+#define savestring - #include - #include - -diff -urN gdb-5.0.org/gdb/tracepoint.c gdb-5.0/gdb/tracepoint.c ---- gdb-5.0.org/gdb/tracepoint.c Tue Dec 14 02:05:38 1999 -+++ gdb-5.0/gdb/tracepoint.c Tue Sep 5 19:38:26 2000 -@@ -36,6 +36,7 @@ - #include "ax-gdb.h" - - /* readline include files */ -+#define savestring - #include - #include - -diff -urN gdb-5.0.org/gdb/tui/Makefile.in gdb-5.0/gdb/tui/Makefile.in ---- gdb-5.0.org/gdb/tui/Makefile.in Tue Sep 5 18:30:00 2000 -+++ gdb-5.0/gdb/tui/Makefile.in Tue Sep 5 18:28:16 2000 -@@ -49,9 +49,9 @@ - BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) - - # Where is the READLINE library? Typically in ../readline. --READLINE_DIR = ../../readline --READLINE_SRC = $(srcdir)/$(READLINE_DIR) --READLINE_CFLAGS = -I$(READLINE_SRC) -+READLINE_DIR = /usr/lib -+READLINE_SRC = /usr/lib -+READLINE_CFLAGS = -I/usr/include/readline - - # Where is the INTL library? Typically in ../intl. - INTL_DIR = ../../intl -diff -urN gdb-5.0.org/gdb/utils.c gdb-5.0/gdb/utils.c ---- gdb-5.0.org/gdb/utils.c Tue Sep 5 18:54:25 2000 -+++ gdb-5.0/gdb/utils.c Tue Sep 5 19:49:03 2000 -@@ -50,6 +50,7 @@ - #include "language.h" - #include "annotate.h" - -+#define savestring - #include - - #undef XMALLOC ---- gdb-5.0/gdb/defs.h.wiget Fri Apr 13 14:59:59 2001 -+++ gdb-5.0/gdb/defs.h Fri Apr 13 15:00:09 2001 -@@ -603,7 +603,7 @@ - - /* From readline (but not in any readline .h files). */ - --extern char *tilde_expand (char *); -+extern char *tilde_expand (const char *); - - /* Control types for commands */ - + # Where is expat? This will be empty if expat was not available. + LIBEXPAT = @LIBEXPAT@ +--- gdb-12.1/Makefile.in.orig 2022-05-01 20:47:43.000000000 +0200 ++++ gdb-12.1/Makefile.in 2022-06-23 22:06:05.298770364 +0200 +@@ -1087,7 +1087,6 @@ configure-host: \ + maybe-configure-libiberty-linker-plugin \ + maybe-configure-libiconv \ + maybe-configure-m4 \ +- maybe-configure-readline \ + maybe-configure-sid \ + maybe-configure-sim \ + maybe-configure-texinfo \ +@@ -1261,7 +1260,6 @@ all-host: maybe-all-libiberty-linker-plu + all-host: maybe-all-libiconv + @endif libiconv-no-bootstrap + all-host: maybe-all-m4 +-all-host: maybe-all-readline + all-host: maybe-all-sid + all-host: maybe-all-sim + all-host: maybe-all-texinfo +@@ -1373,7 +1371,6 @@ info-host: maybe-info-libiberty + info-host: maybe-info-libiberty-linker-plugin + info-host: maybe-info-libiconv + info-host: maybe-info-m4 +-info-host: maybe-info-readline + info-host: maybe-info-sid + info-host: maybe-info-sim + info-host: maybe-info-texinfo +@@ -1464,7 +1461,6 @@ dvi-host: maybe-dvi-libiberty + dvi-host: maybe-dvi-libiberty-linker-plugin + dvi-host: maybe-dvi-libiconv + dvi-host: maybe-dvi-m4 +-dvi-host: maybe-dvi-readline + dvi-host: maybe-dvi-sid + dvi-host: maybe-dvi-sim + dvi-host: maybe-dvi-texinfo +@@ -1555,7 +1551,6 @@ pdf-host: maybe-pdf-libiberty + pdf-host: maybe-pdf-libiberty-linker-plugin + pdf-host: maybe-pdf-libiconv + pdf-host: maybe-pdf-m4 +-pdf-host: maybe-pdf-readline + pdf-host: maybe-pdf-sid + pdf-host: maybe-pdf-sim + pdf-host: maybe-pdf-texinfo +@@ -1646,7 +1641,6 @@ html-host: maybe-html-libiberty + html-host: maybe-html-libiberty-linker-plugin + html-host: maybe-html-libiconv + html-host: maybe-html-m4 +-html-host: maybe-html-readline + html-host: maybe-html-sid + html-host: maybe-html-sim + html-host: maybe-html-texinfo +@@ -1737,7 +1731,6 @@ TAGS-host: maybe-TAGS-libiberty + TAGS-host: maybe-TAGS-libiberty-linker-plugin + TAGS-host: maybe-TAGS-libiconv + TAGS-host: maybe-TAGS-m4 +-TAGS-host: maybe-TAGS-readline + TAGS-host: maybe-TAGS-sid + TAGS-host: maybe-TAGS-sim + TAGS-host: maybe-TAGS-texinfo +@@ -1828,7 +1821,6 @@ install-info-host: maybe-install-info-li + install-info-host: maybe-install-info-libiberty-linker-plugin + install-info-host: maybe-install-info-libiconv + install-info-host: maybe-install-info-m4 +-install-info-host: maybe-install-info-readline + install-info-host: maybe-install-info-sid + install-info-host: maybe-install-info-sim + install-info-host: maybe-install-info-texinfo +@@ -1919,7 +1911,6 @@ install-dvi-host: maybe-install-dvi-libi + install-dvi-host: maybe-install-dvi-libiberty-linker-plugin + install-dvi-host: maybe-install-dvi-libiconv + install-dvi-host: maybe-install-dvi-m4 +-install-dvi-host: maybe-install-dvi-readline + install-dvi-host: maybe-install-dvi-sid + install-dvi-host: maybe-install-dvi-sim + install-dvi-host: maybe-install-dvi-texinfo +@@ -2010,7 +2001,6 @@ install-pdf-host: maybe-install-pdf-libi + install-pdf-host: maybe-install-pdf-libiberty-linker-plugin + install-pdf-host: maybe-install-pdf-libiconv + install-pdf-host: maybe-install-pdf-m4 +-install-pdf-host: maybe-install-pdf-readline + install-pdf-host: maybe-install-pdf-sid + install-pdf-host: maybe-install-pdf-sim + install-pdf-host: maybe-install-pdf-texinfo +@@ -2101,7 +2091,6 @@ install-html-host: maybe-install-html-li + install-html-host: maybe-install-html-libiberty-linker-plugin + install-html-host: maybe-install-html-libiconv + install-html-host: maybe-install-html-m4 +-install-html-host: maybe-install-html-readline + install-html-host: maybe-install-html-sid + install-html-host: maybe-install-html-sim + install-html-host: maybe-install-html-texinfo +@@ -2192,7 +2181,6 @@ installcheck-host: maybe-installcheck-li + installcheck-host: maybe-installcheck-libiberty-linker-plugin + installcheck-host: maybe-installcheck-libiconv + installcheck-host: maybe-installcheck-m4 +-installcheck-host: maybe-installcheck-readline + installcheck-host: maybe-installcheck-sid + installcheck-host: maybe-installcheck-sim + installcheck-host: maybe-installcheck-texinfo +@@ -2283,7 +2271,6 @@ mostlyclean-host: maybe-mostlyclean-libi + mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin + mostlyclean-host: maybe-mostlyclean-libiconv + mostlyclean-host: maybe-mostlyclean-m4 +-mostlyclean-host: maybe-mostlyclean-readline + mostlyclean-host: maybe-mostlyclean-sid + mostlyclean-host: maybe-mostlyclean-sim + mostlyclean-host: maybe-mostlyclean-texinfo +@@ -2374,7 +2361,6 @@ clean-host: maybe-clean-libiberty + clean-host: maybe-clean-libiberty-linker-plugin + clean-host: maybe-clean-libiconv + clean-host: maybe-clean-m4 +-clean-host: maybe-clean-readline + clean-host: maybe-clean-sid + clean-host: maybe-clean-sim + clean-host: maybe-clean-texinfo +@@ -2465,7 +2451,6 @@ distclean-host: maybe-distclean-libibert + distclean-host: maybe-distclean-libiberty-linker-plugin + distclean-host: maybe-distclean-libiconv + distclean-host: maybe-distclean-m4 +-distclean-host: maybe-distclean-readline + distclean-host: maybe-distclean-sid + distclean-host: maybe-distclean-sim + distclean-host: maybe-distclean-texinfo +@@ -2556,7 +2541,6 @@ maintainer-clean-host: maybe-maintainer- + maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin + maintainer-clean-host: maybe-maintainer-clean-libiconv + maintainer-clean-host: maybe-maintainer-clean-m4 +-maintainer-clean-host: maybe-maintainer-clean-readline + maintainer-clean-host: maybe-maintainer-clean-sid + maintainer-clean-host: maybe-maintainer-clean-sim + maintainer-clean-host: maybe-maintainer-clean-texinfo +@@ -2705,7 +2689,6 @@ check-host: \ + maybe-check-libiberty-linker-plugin \ + maybe-check-libiconv \ + maybe-check-m4 \ +- maybe-check-readline \ + maybe-check-sid \ + maybe-check-sim \ + maybe-check-texinfo \ +@@ -2843,7 +2826,6 @@ install-host-nogcc: \ + maybe-install-libiberty-linker-plugin \ + maybe-install-libiconv \ + maybe-install-m4 \ +- maybe-install-readline \ + maybe-install-sid \ + maybe-install-sim \ + maybe-install-texinfo \ +@@ -2899,7 +2881,6 @@ install-host: \ + maybe-install-libiberty-linker-plugin \ + maybe-install-libiconv \ + maybe-install-m4 \ +- maybe-install-readline \ + maybe-install-sid \ + maybe-install-sim \ + maybe-install-texinfo \ +@@ -3010,7 +2991,6 @@ install-strip-host: \ + maybe-install-strip-libiberty-linker-plugin \ + maybe-install-strip-libiconv \ + maybe-install-strip-m4 \ +- maybe-install-strip-readline \ + maybe-install-strip-sid \ + maybe-install-strip-sim \ + maybe-install-strip-texinfo \ +@@ -63072,7 +63052,6 @@ configure-gdb: maybe-all-gnulib + configure-gdb: maybe-all-gdbsupport + all-gdb: maybe-all-gnulib + all-gdb: maybe-all-gdbsupport +-all-gdb: maybe-all-readline + all-gdb: maybe-all-build-bison + all-gdb: maybe-all-sim + all-gdb: maybe-all-libtermcap +@@ -63562,7 +63541,6 @@ install-strip-sid: maybe-install-strip-t + install-sid: maybe-install-tk + install-strip-sid: maybe-install-strip-tk + configure-sim: maybe-all-gnulib +-configure-sim: maybe-all-readline + all-fastjar: maybe-all-build-texinfo + all-libctf: all-libiberty + all-stage1-libctf: all-stage1-libiberty